[merkaartor] 01/08: Imported Upstream version 0.18.3~rc1

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Mon Jun 6 20:54:40 UTC 2016


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

sebastic pushed a commit to branch master
in repository merkaartor.

commit 44d208a2e16081e794fab1ed5e3f8462ee5e80e2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jun 6 20:11:24 2016 +0200

    Imported Upstream version 0.18.3~rc1
---
 .drone.sec                                         |    1 +
 .drone.yml                                         |   30 +
 .travis.yml                                        |   37 +-
 .tx/config                                         |    9 +
 3rdparty/quazip-0.7/NEWS.txt                       |    2 +-
 3rdparty/quazip-0.7/doc/html/classQuaZip.html      |    2 +-
 .../doc/html/structQuaZipFileInfo64.html           |    2 +-
 3rdparty/quazip-0.7/doc/latex/classQuaZip.tex      |    2 +-
 .../doc/latex/structQuaZipFileInfo64.tex           |    2 +-
 3rdparty/quazip-0.7/quazip/quazip.h                |    2 +-
 3rdparty/quazip-0.7/quazip/quazipfile.cpp          |    2 +-
 AUTHORS                                            |    9 +-
 CHANGELOG                                          |   88 +-
 COMPILE.md                                         |  222 +
 HACKING                                            |   11 -
 HACKING.md                                         |   61 +
 INSTALL                                            |  137 -
 Icons/128x128/merkaartor.png                       |  Bin 0 -> 33958 bytes
 Icons/16x16/merkaartor.png                         |  Bin 0 -> 1030 bytes
 Icons/192x192/merkaartor.png                       |  Bin 0 -> 68817 bytes
 Icons/22x22/merkaartor.png                         |  Bin 0 -> 1624 bytes
 Icons/24x24/merkaartor.png                         |  Bin 0 -> 1849 bytes
 Icons/256x256/merkaartor.png                       |  Bin 0 -> 113391 bytes
 Icons/32x32/merkaartor.png                         |  Bin 0 -> 2972 bytes
 Icons/36x36/merkaartor.png                         |  Bin 0 -> 3640 bytes
 Icons/40x40/merkaartor.png                         |  Bin 0 -> 4364 bytes
 Icons/42x42/merkaartor.png                         |  Bin 0 -> 4746 bytes
 Icons/512x512/merkaartor.png                       |  Bin 0 -> 384401 bytes
 Icons/64x64/merkaartor.png                         |  Bin 0 -> 10057 bytes
 Icons/72x72/merkaartor.png                         |  Bin 0 -> 12385 bytes
 Icons/80x80/merkaartor.png                         |  Bin 0 -> 14910 bytes
 Icons/8x8/merkaartor.png                           |  Bin 0 -> 555 bytes
 Icons/96x96/merkaartor.png                         |  Bin 0 -> 20628 bytes
 README.md                                          |   45 +
 Styles/Merkaartor.mas                              | 1085 +++
 TODO                                               |    5 -
 ci/travis-linux-install.sh                         |   13 +
 ci/travis-linux-script.sh                          |    6 +
 ci/travis-osx-install.sh                           |   27 +
 ci/travis-osx-script.sh                            |   46 +
 interfaces/IImageManager.h                         |    4 +-
 .../MCadastreFranceBackground/CadastreFrance.cpp   |    2 +-
 .../MCadastreFranceBackground/CadastreFrance.h     |    2 +-
 plugins/background/MGdalBackground/GdalAdapter.cpp |    2 +-
 plugins/background/MGdalBackground/GdalAdapter.h   |    6 +-
 .../MGeoTiffBackground/GeoTiffAdapter.cpp          |    2 +-
 .../background/MGeoTiffBackground/GeoTiffAdapter.h |    6 +-
 .../MGosmoreBackground/GosmoreAdapter.cpp          |    5 +-
 .../background/MGosmoreBackground/GosmoreAdapter.h |    8 +-
 .../MMsBingMapBackground/msbingmapadapter.h        |    4 +-
 .../background/MNavitBackground/NavitAdapter.cpp   |    2 +-
 plugins/background/MNavitBackground/NavitAdapter.h |    8 +-
 plugins/background/MNavitBackground/NavitBin.cpp   |    5 +-
 plugins/background/MNavitBackground/NavitZip.cpp   |    6 +-
 .../MSpatialiteBackground/SpatialiteAdapter.cpp    |    4 +-
 .../MSpatialiteBackground/SpatialiteAdapter.h      |   10 +-
 .../WalkingPapersAdapter.cpp                       |    4 +-
 .../WalkingPapersAdapter.h                         |    8 +-
 .../MYahooBackground/yahoolegalmapadapter.cpp      |    4 +-
 .../MYahooBackground/yahoolegalmapadapter.h        |    6 +-
 .../MYahooTiledBackground/yahootiledmapadapter.cpp |    4 +-
 .../MYahooTiledBackground/yahootiledmapadapter.h   |    6 +-
 plugins/common.pri                                 |    4 +
 share/Projections.xml                              |    3 +-
 share/TmsServersList.xml                           |   15 +-
 share/WmsServersList.xml                           |   17 +-
 src/Backend/MemoryBackend.cpp                      |  153 +-
 src/Backend/MemoryBackend.h                        |    3 +
 src/Commands/Command.cpp                           |   10 +-
 src/Config.pri                                     |   16 +-
 src/Docks/DirtyDock.ui                             |    6 +-
 src/Docks/FeaturesDock.cpp                         |   57 +-
 src/Docks/FeaturesDock.h                           |    4 +-
 src/Docks/FeaturesDock.ui                          |   51 +-
 src/Docks/GeoImageDock.cpp                         |   20 +-
 src/Docks/GeoImageDock.h                           |    9 +-
 src/Docks/PropertiesDock.cpp                       |    8 +-
 src/Docks/PropertiesDock.h                         |    7 +-
 src/Features/Feature.cpp                           |    6 +-
 src/Features/Feature.h                             |   10 +-
 src/Features/Node.cpp                              |    4 +-
 src/Features/Node.h                                |    2 +-
 src/Features/Relation.h                            |    2 +-
 src/Features/TrackSegment.h                        |    4 +-
 src/Features/Way.cpp                               |   10 +-
 src/Features/Way.h                                 |    2 +-
 src/GPS/qgpsdevice.cpp                             |    7 +
 src/ImportExport/ImportCSVDialog.cpp               |    8 +-
 src/ImportExport/ImportCSVDialog.ui                |   16 +-
 src/ImportExport/ImportExportGdal.cpp              |   10 +-
 src/ImportExport/ImportExportOSC.cpp               |    2 +-
 src/ImportExport/ImportNMEA.cpp                    |    5 +-
 src/Interactions/CreateNodeInteraction.cpp         |    2 +-
 src/Interactions/CreateRoundaboutDock.ui           |   94 +-
 src/Interactions/CreateRoundaboutInteraction.cpp   |   97 +-
 src/Interactions/CreateRoundaboutInteraction.h     |    4 +
 src/Interactions/Interaction.cpp                   |   87 +-
 src/Interactions/Interaction.h                     |   21 +-
 src/Interactions/MoveNodeInteraction.cpp           |    1 +
 src/Interactions/RotateInteraction.h               |    2 +-
 src/Layers/ImageMapLayer.cpp                       |   38 +-
 src/Layers/Layer.cpp                               |    6 +-
 src/Layers/Layer.h                                 |    6 +-
 src/Layers/OsmRenderLayer.cpp                      |   18 +-
 src/Layers/OsmRenderLayer.h                        |    3 +
 src/Main.cpp                                       |   63 +-
 src/MainWindow.cpp                                 |  406 +-
 src/MainWindow.h                                   |    9 +-
 src/MainWindow.ui                                  |  351 +-
 src/PaintStyle/FeaturePainter.cpp                  |   12 +-
 src/PaintStyle/Painter.cpp                         |    2 +-
 src/PaintStyle/PrimitivePainter.cpp                |    4 +-
 src/Preferences/BookmarksList.cpp                  |    2 +-
 src/Preferences/MerkaartorPreferences.cpp          |   87 +-
 src/Preferences/MerkaartorPreferences.h            |    4 +
 src/Preferences/TMSPreferencesDialog.cpp           |   10 +-
 src/Preferences/TMSPreferencesDialog.ui            |   13 +-
 src/Preferences/TmsServersList.cpp                 |    6 +-
 src/Preferences/TmsServersList.h                   |    2 +-
 src/Preferences/WMSPreferencesDialog.cpp           |   87 +-
 src/Preferences/WMSPreferencesDialog.h             |   13 +
 src/Preferences/WMSPreferencesDialog.ui            |   40 +-
 src/Preferences/WmsServersList.cpp                 |    6 +-
 src/QMapControl/WmscMapAdapter.h                   |    4 +-
 src/QMapControl/browserimagemanager.cpp            |   15 +-
 src/QMapControl/browserimagemanager.h              |    6 +-
 src/QMapControl/imagemanager.cpp                   |   13 +-
 src/QMapControl/imagemanager.h                     |    6 +-
 src/QMapControl/mapcontrol.cpp                     |    2 +-
 src/QMapControl/mapcontrol.h                       |    8 +-
 src/QMapControl/mapnetwork.cpp                     |   18 +-
 src/QMapControl/tilemapadapter.h                   |    4 +-
 src/QMapControl/wmsmapadapter.h                    |    4 +-
 src/Render/MapRenderer.cpp                         |  146 -
 src/Render/NativeRenderDialog.cpp                  |   24 +-
 src/Sync/DirtyList.cpp                             |   74 +-
 src/Sync/DirtyListExecutorOSC.cpp                  |    6 +-
 src/Sync/DownloadOSM.cpp                           |  115 +-
 src/Sync/DownloadOSM.h                             |    3 +-
 src/Sync/SyncListDialog.ui                         |  263 +-
 src/TagTemplate/TagTemplate.cpp                    |   32 +-
 src/Tools/QFatFs/QFat.cpp                          |    2 +-
 src/Utils/EditCompleterDelegate.cpp                |    2 +-
 src/Utils/OsmLink.cpp                              |   41 +
 src/Utils/SlippyMapWidget.cpp                      |  208 +-
 src/Utils/SlippyMapWidget.h                        |    6 +-
 src/Utils/TagSelector.cpp                          |   73 +-
 src/Utils/TagSelector.h                            |    6 +-
 src/common/AboutDialog.ui                          |  113 +-
 src/common/Document.cpp                            |    5 +-
 src/common/FeatureManipulations.cpp                |    3 +-
 src/common/Global.cpp                              |    4 +-
 src/common/Global.h                                |    4 +-
 src/common/MapView.cpp                             |   27 +-
 src/common/MapView.h                               |    6 +
 src/common/Projection.cpp                          |   12 +-
 src/common/TagModel.cpp                            |   15 +-
 src/merkaartor.desktop                             |    2 +-
 src/qextserialport/posix_qextserialport.cpp        |    2 +-
 src/src.pro                                        |   84 +-
 translations/README                                |   25 -
 translations/README.md                             |   25 +
 translations/merkaartor_ar.ts                      | 6117 ++++++++---------
 translations/merkaartor_cs.ts                      | 6902 +++++++++----------
 translations/merkaartor_de.ts                      | 6331 +++++++++---------
 .../{merkaartor_et.ts => merkaartor_en.ts}         | 4295 ++++++------
 translations/merkaartor_es.ts                      | 5967 +++++++++--------
 translations/merkaartor_et.ts                      | 6179 ++++++++---------
 translations/merkaartor_fr.ts                      | 6335 +++++++++---------
 translations/merkaartor_hr.ts                      | 5559 +++++++--------
 translations/merkaartor_hu.ts                      | 6221 ++++++++---------
 .../{merkaartor_pl.ts => merkaartor_id_ID.ts}      | 7068 ++++++++++----------
 translations/merkaartor_it.ts                      | 5984 +++++++++--------
 translations/merkaartor_ja.ts                      | 5738 ++++++++--------
 translations/merkaartor_nl.ts                      | 5827 ++++++++--------
 translations/merkaartor_pl.ts                      | 5867 ++++++++--------
 translations/merkaartor_pt.ts                      | 6207 ++++++++---------
 translations/merkaartor_pt_BR.ts                   | 6112 ++++++++---------
 translations/merkaartor_ru.ts                      | 6166 ++++++++---------
 translations/merkaartor_sk.ts                      | 6185 ++++++++---------
 translations/merkaartor_sv.ts                      | 5831 ++++++++--------
 translations/merkaartor_uk.ts                      | 5889 ++++++++--------
 windows/copydeps.sh                                |   14 +
 windows/installer.nsi                              |   11 +-
 windows/upload-to-bintray.pl                       |   33 +
 185 files changed, 64541 insertions(+), 61626 deletions(-)

diff --git a/.drone.sec b/.drone.sec
new file mode 100644
index 0000000..b27cc84
--- /dev/null
+++ b/.drone.sec
@@ -0,0 +1 @@
+eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.YRyQNtOWUCipDm08cZdCER8J8tjoqs-4Heyz-1qT14-dN7bFFkP_fg-Z2Ug-jo78tT7YMtN6y6yTFIv_Wt_jhDqbsAV9ZoKJcIYfKhbLBctQxIUuR8YAXlXDyFbRert1PegbLYMru-FARnupadcQVfPrbunrEWmAJyYQewKJcsO5pGmD8C9q5AkQam4NvD_pp1pxvcFYx_PP3PYVYJCxqZT2GzLEyyaDLNbck3yslN1rleiZI9OzTXO6X9BgOOcsS7IzTN0ZhLVDOP5o2oXcOm_uIai5A1Uuk3lPrczCflTe6_k5_Yh7Wzt2qU6qmDOIoQVzZdjMfmTWOdhXYRvz1Q.Yt3jxqjGb0obh2HQ.1kGJv08npX27KP2-Li2UYL973tKQFDiSO5Sio6v1U2uMla7dicOJkT8pzyianXKx22hWNsUWdqPCS4s-jXg4u [...]
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..5b45f84
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,30 @@
+# This is a build file to tea-ci.org (fork of drone with msys2 support)
+clone:
+    tags: true
+    depth: 200
+branches:
+  - master
+  - tea-ci
+build:
+  image: teaci/msys$$arch
+  pull: true
+  shell: mingw$$arch
+  environment:
+    - BINTRAY_TOKEN=$$BINTRAY_TOKEN
+  commands:
+    - if [ $$arch = 32 ]; then target=i686; fi
+    - if [ $$arch = 64 ]; then target=x86_64; fi
+    - wget http://stuff.krakonos.org/upload && chmod +x upload
+    - pacman -S --noconfirm --needed --noprogressbar unzip curl mingw-w64-${target}-nsis mingw-w64-${target}-qt5 mingw-w64-${target}-gdal mingw-w64-${target}-proj mingw-w64-${target}-openjpeg2 mingw-w64-${target}-json-c msys/perl-common-sense
+    - pacman -S --noconfirm --needed --noprogressbar mingw-w64-${target}-netcdf mingw-w64-${target}-nspr mingw-w64-${target}-nss mingw-w64-${target}-postgresql
+    - qmake -r
+    - make -j8 release
+    - lrelease src/src.pro
+    - sh windows/copydeps.sh
+    - makensis.exe windows/installer.nsi
+    - windows/upload-to-bintray.pl windows/merkaartor-*.exe
+
+matrix:
+  arch:
+    - 64
+    - 32
diff --git a/.travis.yml b/.travis.yml
index 229da78..9e7007d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,30 @@
+sudo: required
+dist: trusty
 env:
- - QT=4
- - QT=5
+    - QT=4
+    - QT=5
+os:
+    - linux
+    - osx
+git:
+    depth: 9999999
 
 install:
- - sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
- - sudo apt-get update -qq
- - sudo apt-cache search qt
- - sudo apt-get install gdb libgdal-dev libproj-dev
- - sudo apt-get install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
- - sudo apt-get install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
- - qtchooser -list-versions
-
+    - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./ci/travis-linux-install.sh; fi
+    - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then ./ci/travis-osx-install.sh;   fi
 
 script:
-  - qtchooser -qt=qt$QT -run-tool=qmake
-  - make
+    - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./ci/travis-linux-script.sh; fi
+    - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then ./ci/travis-osx-script.sh;   fi
+
+deploy:
+    on:
+        branch:
+            - travis-ci
+            - master
+        condition: $TRAVIS_OS_NAME = osx
+    provider: bintray
+    file: binaries/bin/deploy.json
+    user: krakonos
+    key:
+      secure: CMTTCxFAUirt3f+LOOC3ngJKzyqNuLO1il4Vmd8Jq5isAfiiShzs0Qj+8vvsdl7ebyVBQ5srTmwOY1z6B/Jzl5gpHPR3Y2oYt4hFaAkKU6nnlCELX7N/pS1TAXgX8NZjjod0xlfV2700eWDDBRs7gjGWQKhKzRVlMByWYeWV68c=
diff --git a/.tx/config b/.tx/config
new file mode 100644
index 0000000..159bb2d
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+
+[merkaartor.merkaartor_ents]
+file_filter = translations/merkaartor_<lang>.ts
+source_file = translations/merkaartor_en.ts
+source_lang = en
+type = QT
+
diff --git a/3rdparty/quazip-0.7/NEWS.txt b/3rdparty/quazip-0.7/NEWS.txt
index 7388f50..9da6dc4 100644
--- a/3rdparty/quazip-0.7/NEWS.txt
+++ b/3rdparty/quazip-0.7/NEWS.txt
@@ -12,7 +12,7 @@ QuaZIP changes
           need more precise dates and times than default ones.
         * QuaZipNewInfo may now be initialized from QuaZipFileInfo64.
         * No more crashes when using QSaveFile as QIODevice for ZIP.
-        * The new QuaZip::setAutoClose() method allows to leave the
+        * The new QuaZip::setAutoClose() method allows leaving the
           QIODevice open when you close the QuaZip instance.
         * qztest now depends on quazip, no longer breaking the build.
 
diff --git a/3rdparty/quazip-0.7/doc/html/classQuaZip.html b/3rdparty/quazip-0.7/doc/html/classQuaZip.html
index ff96640..3c3b784 100644
--- a/3rdparty/quazip-0.7/doc/html/classQuaZip.html
+++ b/3rdparty/quazip-0.7/doc/html/classQuaZip.html
@@ -441,7 +441,7 @@ class </td><td class="memItemRight" valign="bottom"><b>QuaZipPrivate</b></t
 <p>If the ZIP file is accessed via explicitly set QIODevice, then this device is opened in the necessary mode. If the device was already opened by some other means, then QuaZIP checks if the open mode is compatible to the mode needed for the requested operation. If necessary, seeking is performed to position the device properly.</p>
 <dl class="section return"><dt>Returns</dt><dd><code>true</code> if successful, <code>false</code> otherwise.</dd></dl>
 <dl class="section note"><dt>Note</dt><dd>ZIP/UNZIP API open calls do not return error code - they just return <code>NULL</code> indicating an error. But to make things easier, <a class="el" href="quazip_8h_source.html">quazip.h</a> header defines additional error code <code>UNZ_ERROROPEN</code> and <a class="el" href="classQuaZip.html#a28b91a6282ddd9382c96a069572c6fb4" title="Returns the error code of the last operation. ">getZipError()</a> will return it if the open call of the ZIP/UNZ [...]
-<p>Argument <em>ioApi</em> specifies IO function set for ZIP/UNZIP package to use. See unzip.h, zip.h and ioapi.h for details. Note that IO API for <a class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> is different from the original package. The file path argument was changed to be of type <code>voidpf</code>, and <a class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> passes a QIODevice pointer there. This QIODevice is either set explicitly via <a class=" [...]
+<p>Argument <em>ioApi</em> specifies IO function set for ZIP/UNZIP package to use. See unzip.h, zip.h and ioapi.h for details. Note that IO API for <a class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> is different from the original package. The file path argument was changed to be of type <code>voidpf</code>, and <a class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> passes a QIODevice pointer there. This QIODevice is either set explicitly via <a class=" [...]
 <dl class="section note"><dt>Note</dt><dd>If the zip64 support is needed, the ioApi argument <em>must</em> be NULL because due to the backwards compatibility issues it can be used to provide a 32-bit API only.</dd>
 <dd>
 If the <a class="el" href="classQuaZip.html#a54bfc924762774ccf9f99be075ba7b0e">no-auto-close</a> feature is used, then the <em>ioApi</em> argument <em>should</em> be NULL because the old API doesn't support the 'fake close' operation, causing slight memory leaks and other possible troubles (like closing the output device in case when an error occurs during opening).</dd></dl>
diff --git a/3rdparty/quazip-0.7/doc/html/structQuaZipFileInfo64.html b/3rdparty/quazip-0.7/doc/html/structQuaZipFileInfo64.html
index 0140e04..9f74dca 100644
--- a/3rdparty/quazip-0.7/doc/html/structQuaZipFileInfo64.html
+++ b/3rdparty/quazip-0.7/doc/html/structQuaZipFileInfo64.html
@@ -285,7 +285,7 @@ QByteArray </td><td class="memItemRight" valign="bottom"><a class="el" href
 </div><div class="memdoc">
 
 <p>Last modification date and time. </p>
-<p>This is the time stored in the standard ZIP header. This format only allows to store time with 2-second precision, so the seconds will always be even and the milliseconds will always be zero. If you need more precise date and time, you can try to call the <a class="el" href="structQuaZipFileInfo64.html#af4b19399367cf5bf24026344e0631ccb" title="Returns the NTFS modification time. ">getNTFSmTime()</a> function or its siblings, provided that the archive itself contains these NTFS times. </p>
+<p>This is the time stored in the standard ZIP header. This format only allows storing time with 2-second precision, so the seconds will always be even and the milliseconds will always be zero. If you need more precise date and time, you can try to call the <a class="el" href="structQuaZipFileInfo64.html#af4b19399367cf5bf24026344e0631ccb" title="Returns the NTFS modification time. ">getNTFSmTime()</a> function or its siblings, provided that the archive itself contains these NTFS times. </p>
 
 <p>Referenced by <a class="el" href="classQuaZip.html#a7ba6daf39263c308c683e7f72f74e0ae">QuaZip::getCurrentFileInfo()</a>, and <a class="el" href="structQuaZipFileInfo64.html#ada29945c7ee4c9df6fbe95864793aade">toQuaZipFileInfo()</a>.</p>
 
diff --git a/3rdparty/quazip-0.7/doc/latex/classQuaZip.tex b/3rdparty/quazip-0.7/doc/latex/classQuaZip.tex
index 662fb77..5c8116b 100644
--- a/3rdparty/quazip-0.7/doc/latex/classQuaZip.tex
+++ b/3rdparty/quazip-0.7/doc/latex/classQuaZip.tex
@@ -298,7 +298,7 @@ If the Z\-I\-P file is accessed via explicitly set Q\-I\-O\-Device, then this de
 \begin{DoxyNote}{Note}
 Z\-I\-P/\-U\-N\-Z\-I\-P A\-P\-I open calls do not return error code -\/ they just return {\ttfamily N\-U\-L\-L} indicating an error. But to make things easier, \doxyref{quazip.\-h}{p.}{quazip_8h_source} header defines additional error code {\ttfamily U\-N\-Z\-\_\-\-E\-R\-R\-O\-R\-O\-P\-E\-N} and \doxyref{get\-Zip\-Error()}{p.}{classQuaZip_a28b91a6282ddd9382c96a069572c6fb4} will return it if the open call of the Z\-I\-P/\-U\-N\-Z\-I\-P A\-P\-I returns {\ttfamily N\-U\-L\-L}.
 \end{DoxyNote}
-Argument {\itshape io\-Api} specifies I\-O function set for Z\-I\-P/\-U\-N\-Z\-I\-P package to use. See unzip.\-h, zip.\-h and ioapi.\-h for details. Note that I\-O A\-P\-I for \doxyref{Qua\-Zip}{p.}{classQuaZip} is different from the original package. The file path argument was changed to be of type {\ttfamily voidpf}, and \doxyref{Qua\-Zip}{p.}{classQuaZip} passes a Q\-I\-O\-Device pointer there. This Q\-I\-O\-Device is either set explicitly via \doxyref{set\-Io\-Device()}{p.}{classQua [...]
+Argument {\itshape io\-Api} specifies I\-O function set for Z\-I\-P/\-U\-N\-Z\-I\-P package to use. See unzip.\-h, zip.\-h and ioapi.\-h for details. Note that I\-O A\-P\-I for \doxyref{Qua\-Zip}{p.}{classQuaZip} is different from the original package. The file path argument was changed to be of type {\ttfamily voidpf}, and \doxyref{Qua\-Zip}{p.}{classQuaZip} passes a Q\-I\-O\-Device pointer there. This Q\-I\-O\-Device is either set explicitly via \doxyref{set\-Io\-Device()}{p.}{classQua [...]
 
 \begin{DoxyNote}{Note}
 If the zip64 support is needed, the io\-Api argument {\itshape must} be N\-U\-L\-L because due to the backwards compatibility issues it can be used to provide a 32-\/bit A\-P\-I only.
diff --git a/3rdparty/quazip-0.7/doc/latex/structQuaZipFileInfo64.tex b/3rdparty/quazip-0.7/doc/latex/structQuaZipFileInfo64.tex
index 7a4798f..4902665 100644
--- a/3rdparty/quazip-0.7/doc/latex/structQuaZipFileInfo64.tex
+++ b/3rdparty/quazip-0.7/doc/latex/structQuaZipFileInfo64.tex
@@ -197,7 +197,7 @@ The N\-T\-F\-S creation time, U\-T\-C
 
 Last modification date and time. 
 
-This is the time stored in the standard Z\-I\-P header. This format only allows to store time with 2-\/second precision, so the seconds will always be even and the milliseconds will always be zero. If you need more precise date and time, you can try to call the \doxyref{get\-N\-T\-F\-Sm\-Time()}{p.}{structQuaZipFileInfo64_af4b19399367cf5bf24026344e0631ccb} function or its siblings, provided that the archive itself contains these N\-T\-F\-S times. 
+This is the time stored in the standard Z\-I\-P header. This format only allows storing time with 2-\/second precision, so the seconds will always be even and the milliseconds will always be zero. If you need more precise date and time, you can try to call the \doxyref{get\-N\-T\-F\-Sm\-Time()}{p.}{structQuaZipFileInfo64_af4b19399367cf5bf24026344e0631ccb} function or its siblings, provided that the archive itself contains these N\-T\-F\-S times. 
 
 Referenced by Qua\-Zip\-::get\-Current\-File\-Info(), and to\-Qua\-Zip\-File\-Info().
 
diff --git a/3rdparty/quazip-0.7/quazip/quazip.h b/3rdparty/quazip-0.7/quazip/quazip.h
index 0dd4023..71d1db9 100644
--- a/3rdparty/quazip-0.7/quazip/quazip.h
+++ b/3rdparty/quazip-0.7/quazip/quazip.h
@@ -173,7 +173,7 @@ class QUAZIP_EXPORT QuaZip {
      * set explicitly via setIoDevice() or the QuaZip(QIODevice*)
      * constructor, or it is created internally when opening the archive
      * by its file name. The default API (qioapi.cpp) just delegates
-     * everything to the QIODevice API. Not only this allows to use a
+     * everything to the QIODevice API. Not only this allows using a
      * QIODevice instead of file name, but also has a nice side effect
      * of raising the file size limit from 2G to 4G (in non-zip64 archives).
      *
diff --git a/3rdparty/quazip-0.7/quazip/quazipfile.cpp b/3rdparty/quazip-0.7/quazip/quazipfile.cpp
index 3f674b0..0312233 100644
--- a/3rdparty/quazip-0.7/quazip/quazipfile.cpp
+++ b/3rdparty/quazip-0.7/quazip/quazipfile.cpp
@@ -70,7 +70,7 @@ class QuaZipFilePrivate {
     /// Sets the zip error.
     /**
       This function is marked as const although it changes one field.
-      This allows to call it from const functions that don't change
+      This allows calling it from const functions that don't change
       anything by themselves.
       */
     void setZipError(int zipError) const;
diff --git a/AUTHORS b/AUTHORS
index 1a8dafc..58698ea 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,13 @@
-Copyright 2006-2014 Bart Vanhauwaert, Chris Browet, Ladislav Láska and others
+Copyright 2006-2016 Bart Vanhauwaert, Chris Browet, Ladislav Láska and others
 
-AUTHORS
+ACTIVE CONTRIBUTORS
+
+Ladislav Láska <krakonos at krakonos.org>
+
+PAST CONTRIBUTORS
 
 Bart Vanhauwaert bvh-osm at irule.be
 Chris "Koying" Browet
-Ladislav Láska <krakonos at krakonos.org>
 Elrond elrond+openstreetmap.org at samba-tng.org
 Oliver Heesakkers
 Patric Cameron
diff --git a/CHANGELOG b/CHANGELOG
index 135924b..5fa8135 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -74,7 +74,7 @@ v0.18
     * ADD : Self-contained style packages (*.msz)
     * FIX : mutex deadlock (refs #3319)
     * FIX : Protect updatemeta (fixes #3317)
-    * ADD : Allow to show/hide the toolbars labels (toolbar context menu)
+    * ADD : Allow showing/hiding the toolbars labels (toolbar context menu)
     * ADD : "Select parent(s)" & "Download missing children" to the Feature menu (refs #3314)
     * FIX : force redrawing the osm map when zooming (fixes #3316)
     * FIX : Mutex-lock update of the painters (fixes #3315)
@@ -122,9 +122,9 @@ v0.18
     * FIX : do not create  ~/.merkaartor in portable mode
     * FIX : Handle UTF8 in GDAL fields
     * CHG : When doing GDAL imports, always confirm input projection
-    * ADD : Allow to use projection chooser in projection editor
-    * ADD : Allow to enter WKT in projection chooser
-    * ADD : Goto dialog: Allow to show/edit coordinates in projected units
+    * ADD : Allow using projection chooser in projection editor
+    * ADD : Allow entering WKT in projection chooser
+    * ADD : Goto dialog: Allow showing/editing coordinates in projected units
     * FIX : Only check styles for POI nodes
     * FIX : Feature dock: Relations not shown in "All' tab
     * FIX : log2 not available on FreeBSD (fixes #3211)
@@ -136,17 +136,17 @@ v0.18
 v0.17
     * FIX : Problem importing OSM comprising new features
     * ADD : Move "validation" style rules to a new "Validation.mas" style
-    * ADD : Allow to align background image with <SPACE>+pan
+    * ADD : Allow aligning background image with <SPACE>+pan
     * CHG : Rename "Create rectangle" to "Create rectangular building" and automatically add "building=yes"
     * ADD : Remember "Create polygon" last number of sides
-    * ADD : "Relation->Add to Multipolygon"; allows to create or add to a multipolygon relation (closes 2889)
+    * ADD : "Relation->Add to Multipolygon"; allows creating or adding to a multipolygon relation (closes 2889)
     * ADD : Network timeout preference
     * CHG : Paste Tags : Allow any<->any pasting but only takes top level features into account (fixes #3174)
     * FIX : When loading history from MDC, do not import the command if the layer is not found + save layers dirty level in MDC (fixes #3176)
     * FIX : Locked zoom was bugged since passage to real pixel per Meter (fixes #3175)
     * FIX : Allow creating a way in non-separate move mode with a virtual node selected (fixes #3172)
     * FIX : Revert to custom icon for move interaction on MAC (fixes #3170)
-    * FIX : GeoTIFF + GDAL backgrounds: Allow to specify an automatic "source" tag via the plugin menu
+    * FIX : GeoTIFF + GDAL backgrounds: Allow specifying an automatic "source" tag via the plugin menu
     * ADD : Bing Maps plugin
     * FIX : GDAL + GeoTIFF : if a ESRI World File (.tfw, *.wld) is present, override file geotransform
     * FIX : GDAL + GeoTIFF : if the projection cannot be determined, ask for it rather than fail
@@ -154,15 +154,15 @@ v0.17
     * FIX : Cannot access TMS servers that Min-zoom equals Max-zoom (fixes #3157)
     * ADD : GDAL raster background plugin
     * FIX : WMS Editor - Handle Styles properly
-    * ADD : Explicitely add GML to the list of supported format (via GDAL)
+    * ADD : Explicitly add GML to the list of supported format (via GDAL)
     * ADD : Bicycle style by Markus Straub
-    * ADD : Styles : allow to texture areas with an icon
-    * CHG : When opening/importing, always fallback to GDAL if available. Allows to open most GDAL supported geomtery files.
+    * ADD : Styles : allow texturing areas with an icon
+    * CHG : When opening/importing, always fallback to GDAL if available. Allows opening most GDAL supported geomtery files.
     * ADD : Vector map layers
     * ADD : Allow "[*] is xxx" (or "*=xxx") construct in tag selection. Means a feature match if any of its tags has xxx as a value (fixes #3146)
-    * ADD : Do not allow to delete OSM nodes in non-downloaded areas (refs #3083)
+    * ADD : Do not allow deleting OSM nodes in non-downloaded areas (refs #3083)
     * ADD : Save the downloaded areas in the MDC. Expired after 12h.
-    * ADD : Allow to specify the Nominatim url in preferences
+    * ADD : Allow specifying the Nominatim url in preferences
     * ADD : French Cadastre plugin
     * FIX : Infloop on next/previous image when none visible (fixes #3135)
     * CHG : Do not wait for "CLOSE changeset" response
@@ -171,7 +171,7 @@ v0.17
     * ADD : Auto-add "source" tag when drawing over a background map; define the value in the WMS and TMS editors
     * FIX : Filter out invalid value for first Tag list column width (fixes #3129)
     * FIX : Remove tags from autocomplete suggestions when cleared from features (fixes #3113)
-    * ADD : Allow to start merkaartor with a document template specified in preferences
+    * ADD : Allow starting merkaartor with a document template specified in preferences
     * CHG : Layers & View settings are now saved in a $HOME/Startup.mdc document rather than thru QSettings
     * ADD : New CL options: "--ignore-preferences" && "--reset-preferences"
     * FIX : Re-enable PgUp/PgDown in Geoimage dock (dock must be focused) (fixes #3126); coincidentaly, PgUp/PgDown for zooming only works when the map view is focused.
@@ -183,7 +183,7 @@ v0.17
     * FIX : remove dependency on GDAL data files when importing OSGB36 shapefiles + correct projection (closes #3119)
     * ADD : New preference: "Allow node/way creation in select mode". When checked, allows double-click to create a node and double-click on a node to start a way in select mode.
     * ADD : When drawing ways, double-clicking finishes the current way (Potlach/JOSM style)
-    * ADD : Way segments: Keeping ALT depressed allows to move way segment
+    * ADD : Way segments: Keeping ALT depressed allows moving a way segment
     * ADD : In Road creation mode, double-click creates a new node
     * ADD : Hardcoded PgUp/PgDown for Zoom in/Zoom out (Potlach style)
     * ADD : Snap to angle functionality when creating way: keeping "o" pressed snap to 45° angles, "h" snap to 30° angles
@@ -193,13 +193,13 @@ v0.17
     * ADD : Cut functionality
     * ADD : double-clicking a feature selects the feature and its children
     * CHG : style update
-    * ADD : Style Editor: allow to filter the style list
+    * ADD : Style Editor: allow filtering the style list
     * FIX : Styles: draw icons for ways, too
-    * FIX : allow to shrink properties dock
+    * FIX : allow shrinking properties dock
     * ADD : Support for XAPI
     * ADD : ":dirty" and ":uploaded" pseudo tags for finding/filtering
     * CHG : Remove builtin "Dirty" and "Uploaded" layers. Those are now managed at feature level.
-    * ADD : Allow to rename a layer by double-clicking on its name
+    * ADD : Allow renaming a layer by double-clicking on its name
     * FIX : Initial viewport issue
     * ADD : View menu item allowing to highlight "dirty" features, i.e., features ready for upload
     * FIX : Do not export incomplete features
@@ -226,14 +226,14 @@ v0.17
     * FIX : problem with "Bottom-left standard" TMS
     * ADD : Printing
     * ADD : Hungarian translation by Peter Sulyok
-    * CHG : Allow to pan with middle mouse button
+    * CHG : Allow panning with middle mouse button
     * ADD : Toolbar editor (create/modify tollbars)
     * FIX : OSX fix
     * FIX : Draw relations children dashed to avoid multiple parent drawing
     * FIX : Fix several issues with features dock.
     * FIX : Fix reappearance of deleted features.
     * FIX : Fix WayRemoveNodeCommand reversibility.
-    * ADD : Allow to move complete relations
+    * ADD : Allow moving complete relations
     * FIX : WMS'es in EPSG:4326 not showing
     * FIX : Don't overzoom on layer zoom (and don't allow if the bbox is null). fixes #3046
     * ADD : Add a "portable" mode to merkaartor via command-line ("-p") or build setting ("PORTABLE=1")
@@ -257,12 +257,12 @@ v0.16
     * FIX : Make JOSM happy about our .osm export (fixes #2952)
     * ADD : Preliminary support for OpenStreetBugs (Refs #983)
     * ADD : POC of a Gosmore map adapter
-    * FIX : Allow to "Force Upload" relations, too (fixes #2926)
+    * FIX : Allow one to "Force Upload" relations, too (fixes #2926)
     * FIX : Update Feature dock when document content changes (fixes #2923)
     * CHG : Change way the virtual nodes are handled
     * CHG : Allow tag pasting between different classes of features
     * CHG : Use a different spatial index provider
-    * ADD : Allow to delete features from the context menu of the Features dock
+    * ADD : Allow deleting features from the context menu of the Features dock
     * ADD : Accept mlon/mlat URLs as emitted by mkgmap logging
     * ADD : Walking Papers backgound plugin + load WP scans as geotagged images
     * ADD : Import from OSC (osmChange format)
@@ -272,10 +272,10 @@ v0.16
     * ADD : CSV POI import
     * FIX : crash when closing layer with virtual nodes (fixes #2858)
     * ADD : OSGB36 to the default list of projections
-    * CHG : Allow to add images to a GeoTIFF layer
+    * CHG : Allow adding images to a GeoTIFF layer
     * ADD : Add SHP feature attributes as not uploadable OSM Feature tags
-    * FIX : Allow to load OS VectorMap District shapefiles
-    * ADD : Allow to save geotagged images
+    * FIX : Allow loading OS VectorMap District shapefiles
+    * ADD : Allow saving geotagged images
     * CHG : Enhanced support for geotagged images drag&drop
     * CHG : Geotag support enhancements
     * FIX : use gpsd api and implement gpsd-ng
@@ -284,12 +284,12 @@ v0.16
     * FIX : crash when closing layers containing photos (fixes #2828)
     * CHG : Allow importing geotagged photos when no track layer is present (closes #2827)
     * ADD : Templates xsd (by Jonathan Bennett) (closes #2809; closes #2707)
-    * ADD : allow to re-order relation members (closes #2759)
+    * ADD : allow re-ordering relation members (closes #2759)
     * FIX : solves a problem when hovering large relations
     * ADD : add a projection editor
     * ADD : allow google maps links in goto and download dialogs
     * FIX : abort tile downloading when zooming
-    * ADD : Allow to tile (and cache) arbitrary WMS'es (only EPSG:4326 and google projection supported)
+    * ADD : Allow tiling (and caching) arbitrary WMS'es (only EPSG:4326 and google projection supported)
     * CHG : rework "Zoom lock" and move it to the view menu
     * ADD : support for WMS-C servers (see http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers) (closes #2598)
     * FIX : problem when joining ways
@@ -304,7 +304,7 @@ v0.16
     * FIX : OSX Qt system translations location (by Aleksandar)
     * FIX : Update language of language combo after language change (by Alaeksandar)
     * FIX : Only allow virtual node updates after relations resolution (by Trav)(closes #2782)
-    * ADD : Allow to zoom on the location of a GeoTIFF image
+    * ADD : Allow zooming on the location of a GeoTIFF image
     * FIX : Do not updateindex() if the feature is deleted
     * FIX : roads not always refreshed when changing type or properties (fixes #2773)
     * FIX : Cannot cleanly copy tags from one relation to another (fixes #2746)
@@ -335,7 +335,7 @@ v0.15
     * ADD : GeoTIFF background plugin (closes #1025)
     * ADD : Grabbing hand icon in signle mouse mode
     * FIX : Layers menu entry for background layer is wrong at startup. Patch by Trav (closes #2641)
-    * ADD : When in "single mouse button" mode, allow to cancel most operation with a right-click
+    * ADD : When in "single mouse button" mode, allow canceling most operation with a right-click
     * ADD : "Zoom lock" mode. Zoom steps are locked to TMS ones and projection is locked to Mercator
     * FIX : get sharper Yahoo images (closes #2623)
     * FIX : tag value "Fast food" should be "fast_food" (closes #2625)
@@ -345,7 +345,7 @@ v0.15
     * FIX : URL's in about dialog (fixes #2606)
     * FIX : Export trackpoints time when exporting GPX (fixes #2594)
     * ADD : Virtual nodes allow fast creation of intermediary nodes (closes #821)
-    * ADD : Allow to move node in Node creation mode (closes #1910)
+    * ADD : Allow moving node in Node creation mode (closes #1910)
     * CHG : Only generate log files on request (--log) on release builds
     * FIX : speedup epsg:4326 projection
     * FIX : WMS projection related bugfixes
@@ -362,7 +362,7 @@ v0.15
     * ADD : Mac OS X icon (closes #2254)
     * FIX : Force custom Qt style if Qt runtime version < 4.5.1 (fixes #2204)
     * ADD : Allow all platforms to connect to a gpsd backend
-    * FIX : Set gpsd output to NMEA; allow to save log
+    * FIX : Set gpsd output to NMEA; allow saving log
     * FIX : Do not draw background if saved pixmap is null as a copy of a null pixmap seems to crash on Mac (fixes #2262)
     * FIX : Fixes MacOSX plugin dir (fixes #2253)
     * FIX : Handle latlong projection in SHP files (fixes #2183)
@@ -384,12 +384,12 @@ v0.14
     * ADD : Add a Features dock displaying the features in the current viewport
     * ADD : Add a case-sensitiveness option to the search + search by ID (closes #1509)
     * CHG : Remove support for osmarender (fixes #1966)
-    * ADD : Allow multi-selection of layers; allow to show/hide or readonly several layers at once (closes #1798)
+    * ADD : Allow multi-selection of layers; allow one to show/hide or readonly several layers at once (closes #1798)
     * ADD : Also export routes in GPX
     * ADD : Paste features as a whole (closes #1807)
     * ADD : Spatial indexing of features for faster display with large downloaded areas.
     * ADD : Built-in list of epsg projections (from proj4)
-    * CHG : Replaced "Commit..." command by "Force Upload". Allows to force update of existing features or to upload imported features (such as SHP, KML, ...)
+    * CHG : Replaced "Commit..." command by "Force Upload". Allows forcing update of existing features or to upload imported features (such as SHP, KML, ...)
     * FIX : User preferences thru OSM preferences system works again
     * FIX : Support projections when importing SHP files
     * ADD : Drag & drop re-ordering of the layers
@@ -413,7 +413,7 @@ v0.14
     * ADD : log file for debugging output
     * ADD : standard command-line arguments (-h, -v, ...) (fixes #1712)
     * FIX : Use application-wide proxy (fixes #1763)
-    * ADD : Allow to specify a user/password for the proxy (untested by me)
+    * ADD : Allow specifying a user/password for the proxy (untested by me)
     * FIX : Photo localization patch from Toby Speight.
     * FIX : Set version of newly uploaded objects at 1.
     * FIX : Graphical corruption on Intel chipsets when "Show downloaded areas" was enabled
@@ -423,7 +423,7 @@ v0.14
     * FIX : API 0.6: Error when deleting a road with no nodes (fixes #1732)
     * FIX : Correctly handle plural forms in MapLayer information
     * FIX : API 0.6: Do not add "created_by" to changed features (fixes #1728)
-    * FIX : API 0.6: Allow to define a comment on a changeset (fixes #1731)
+    * FIX : API 0.6: Allow defining a comment on a changeset (fixes #1731)
     * FIX : API 0.6 fixes
     * FIX : Nodes fetched by relations are incomplete and not completed by "download more" (fixes #1715)
     * ADD : Initial support for Symbian S60v5
@@ -435,9 +435,9 @@ v0.14
     * FIX : OSM/GPX import optimisations (by Trav)
     * FIX : <Esc> in Name property inspector causes AV (fixes #1672)
     * CHG : Move vector background from SHP to OSB
-    * CHG : Preferences are uploaded to OSM in binary, base-64 encoded, 254 char slice. Allow to bypass the 255 char per preference limitation.
+    * CHG : Preferences are uploaded to OSM in binary, base-64 encoded, 254 char slice. Allow bypassing the 255 char per preference limitation.
     * CHG : Preferences lists (Bookmarks, WMS servers, ...) are now distributed and saved as XML in ~/.merkaartor. Allow proper merging (fixes #1401)
-    * ADD : Allow to choose which Qt style to use via a combobox
+    * ADD : Allow choosing which Qt style to use via a combobox
     * CHG : Implement the custom styles as plugins
     * FIX : English language warning
     * ADD : Switch to template-based projection handling; remove dependency on libproj
@@ -461,7 +461,7 @@ v0.13
     * FIX : Crash on layer close
     * FIX : Hardening upload process
     * FIX : Remove the deleted road from parent when joining
-    * FIX : allow to split/join roads belonging to not-completely-downloaded relations
+    * FIX : allow spliting/joining roads belonging to not-completely-downloaded relations
     * FIX : Avert crashes by using guarded pointers
     * FIX : In case of a failed "Download more", do not delete layer if it was a previously existing one.
     * FIX : GeoTagged images are drawn to the full size of GeoImageDock
@@ -477,7 +477,7 @@ v0.13
     * FIX : Handle Undoes while creating single/double roads (fixes #1621)
     * FIX : Re-apply custom shortcuts after retranslateUI (fixes #1620)
     * FIX : Insufficent precision for WMS bbox requests at high zoom (fixes #1618)
-    * ADD : Allow to force the custom Qt style thru Config.pri
+    * ADD : Allow forcing the custom Qt style thru Config.pri
     * FIX : Do not remove incomplete downloaded relation; make them readonly and display them in red (temporary)
     * FIX : Painting slowdowns (+ memory consumption) when relations are involved (fixes #1528)
     * FIX : Split roads not added to Relation (fixes #1586)
@@ -501,10 +501,10 @@ v0.13
     * FIX : Add missing tr() calls in render dialogs.
     * FIX : Messagebox-Cancel after deleting a line did not work (fixes #1392)
     * ADD : Native SVG renderer
-    * ADD : Allow to break roads (and areas) with a single node (fixes #1505)
+    * ADD : Allow breaking roads (and areas) with a single node (fixes #1505)
     * ADD : Relation member context menu for center and zoom on the properties
     dock
-    * ADD : Allow to remove a member from a relation thru the properties dock.
+    * ADD : Allow removing a member from a relation thru the properties dock.
     * FIX : switch to skulpture 2.2 custom style by default
     * FIX : Don't allow templates combo to grow depending on content (fixes #1482)
     * FIX : Allow disabling "Don't connect GPX nodes separated more than.." by setting it to 0. (fixes #1488)
@@ -603,7 +603,7 @@ v0.12
     * FIX : Upload of a modified single GPX track node was not working anymore (fixes #1141)
     * ADD : Support for GeoTagged images. qmake GEOIMAGE=1 to activate. requires exiv2 (by Timo Schlüßler)
     * ADD : Move to the next field on enter in properties dock tags (by Travers Carter) (Refs #1137)
-    * ADD : revised OSB format. Allows to use large map files directly from disk with low memory footprint.
+    * ADD : revised OSB format. Allows using large map files directly from disk with low memory footprint.
     * FIX : Native render doesn't render anything at high lat/long values(by Travers Carter)  (Closes #1135)
     * FIX : Expand tables in the properties dock to the available width by default (by Travers Carter) (Closes #1136)
     * FIX : make download dialog a less cluttered
@@ -721,7 +721,7 @@ v0.11
     * ADD : french translation
     * ADD : Merkaartor document (*.mdc)
     * FIX : Apply button in Preferences now updates the main window immediately
-    * FIX : if a feature contains a node more than once, if the node is deleted, only the first occurence is removed
+    * FIX : if a feature contains a node more than once, if the node is deleted, only the first occurrence is removed
     * ADD : merge nodes function
     * FIX : don't ignore "width" tags on export
     * ADD : translation capabilities
@@ -839,7 +839,7 @@ v0.07 18 aug 2007
     * ADD : nice painting for water
     * ADD : file->new menu option to start a new map
     * FIX : change current directory when opening a file
-    * FIX : surpress drawing artefact when creating a new segment
+    * FIX : suppress drawing artefact when creating a new segment
     * FIX : avoid Qt to have to process download notifications recursively
     * ADD : scripts to create the windows installation package
     * ADD : create way from selected segments tool
@@ -855,7 +855,7 @@ v0.06 5 dec 2006
     * ADD : type combobox to set highway tag
     * FIX : no busy waiting for OSM download
     * ADD : progress dialog while downloading from OSM
-    * FIX : refresh view immediatly after download
+    * FIX : refresh view immediately after download
     * FIX : download segments outside original bounding box for roads
     * FIX : don't call QStatusbar methods from a paintEvent
     * FIX : speed up drawing of roads when zoomed out
diff --git a/COMPILE.md b/COMPILE.md
new file mode 100644
index 0000000..5e9d1fb
--- /dev/null
+++ b/COMPILE.md
@@ -0,0 +1,222 @@
+# Compiling Merkaartor
+
+These are the instructions for compiling Merkaartor from git source. Here is the
+short version, given you have all the dependencies and are familiar with your
+build environment:
+
+```
+$ git clone https://github.com/openstreetmap/merkaartor.git && cd merkaartor
+$ qmake -r
+$ make -j8 release
+```
+
+And run it using:
+
+```
+$ binaries/bin/merkaartor
+```
+
+If this is not enough, here are more detailed instructions:
+
+## Prerequisites
+
+You will need the following packages installed:
+
+ - Working C++ compiler
+ - Qt 4.x (4.4.0 or newer) or Qt 5.x (5.3.1 or later)
+ - Proj.4
+ - GDAL (2.0.0 or newer for GDAL exports)
+ - spatialite-4.1.0 or newer for GDAL exports
+ - (For Windows Installer) NSIS-3
+
+The OS specifics will be explained further down.
+
+### Linux
+
+Install the above packages using your package manager. For Ubuntu, this would
+look like this:
+
+```
+ $ sudo apt-get -qq install libgdal-dev libproj-dev
+```
+
+For Qt4:
+
+```
+ $ sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
+```
+
+Or for Qt5: 
+
+```
+ $ sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
+```
+
+### Windows (32bit/64bit)
+
+In both cases, you will need to download MSYS2 for your architecture, and
+install some packages from msys shell (msys2_shell.bat).
+
+For 32bit, they are (the w64 is not a bug!):
+
+```
+$ pacman -S base-devel \
+	msys/git \
+	mingw32/mingw-w64-i686-qt5 \
+	mingw32/mingw-w64-i686-gdal \
+	mingw32/mingw-w64-i686-proj \
+	mingw32/mingw-w64-i686-openjpeg2 \
+	mingw32/mingw-w64-i686-json-c
+```
+
+For 64bit, they are:
+
+```
+$ pacman -S base-devel \
+	msys/git \
+	mingw64/mingw-w64-x86_64-qt5 \
+	mingw64/mingw-w64-x86_64-gdal \
+	mingw64/mingw-w64-x86_64-proj \
+	mingw64/mingw-w64-x86_64-openjpeg2 \
+	mingw64/mingw-w64-x86_64-json-c
+```
+
+Done? Continue to the next step, but run a different msys shell, the mingw32 or
+mingw64, based on your architecture. Note that if you'll run mingw32 shell from
+64bit msys installtion, strange stuff will happen, so don't do it.
+
+### Mac OS X
+
+You will need functional xcode (or other c++ compiler), and libraries installed
+from [homebrew](http://brew.sh).
+
+```
+brew install gdal proj qt
+```
+
+If you want to use qt5, you need to force link it, as homebrew guys consider Qt4
+the default:
+
+```
+brew install qt5
+brew link --force qt5
+```
+
+You can do without linking, but you will need to manually supply some paths to
+the build environment.
+
+## Compilation
+
+### Clone the repository
+
+```
+$ git clone https://github.com/openstreetmap/merkaartor.git && cd merkaartor
+```
+
+>  By default, this is the latest development version. If you want to use an older
+>  one, you have to checkout the commit/tag:
+>  
+>  $ git checkout 0.17.0
+>  
+>  Please, use this only for testing (for example, if some feature does not
+>  work, but it did in older release and you want to check which one), never
+>  report bugs for older versions.
+
+### Run qmake
+
+```
+$ qmake -r
+```
+
+Note that you need the Qt4 or Qt5 version of qmake - running the Qt3 version
+will generate incorrect makefiles.  If both are installed, take care to run the
+correct version.  For example, on Fedora/Debian run
+
+```
+$ qmake-qt4
+```
+
+and on (K)ubuntu run
+
+```
+$ /usr/share/qt4/bin/qmake
+```
+
+There are some parameters you can pass to qmake to customize build:
+
+| Parameter | Meaning |
+| --- | ---
+| PREFIX=<path>               | base prefix for installation (unix only) |
+| TRANSDIR_MERKAARTOR=<path>  | where will the Merkaartor translations be installed |
+| TRANSDIR_SYSTEM=<path>      | where your global Qt translation directory is | 
+| NODEBUG=1                   | release target |
+| NOUSEWEBKIT                 | disable use of WebKit (Yahoo adapter) |
+| SYSTEM_QTSA                 | use system copy of qtsingleapplication instead of internal |
+| SYSTEM_QUAZIP               | use system copy of quazip instead of internal |
+| SYSTEM_QUAZIP_LDFLAGS       | custom flags instead of the default "-lquazip", if your library has different name |
+| SPATIALITE=1                | compile spatialite backend (not working) and SpatialiteBackground plugin (state unknown). Use at your own risk. |
+
+
+### Run make
+
+On Windows:           $ make release
+On other platforms:   $ make
+Debug build:          $ make debug
+
+On Linux, make release fails, as the qmake does not generate proper goal in
+Makefiles, but release is the default. On most Windows installations, the debug
+is the default and we need to specify the release manually. Sorry about that.
+
+### Done!
+
+If you are lucky, you'll find an executable in the binaries subdirectory.
+Otherwise, check our [github page](http://github.com/openstreetmap/merkaartor), especially check the issues and possibly
+report yours.
+
+## Packaging
+
+If you want to create installer package, read further.
+
+### Linux
+
+Nothing special here, just follow your distribution's guidelines.
+
+### Windows
+
+You first have to copy all dependencies of merkaartor to the binaries/bin
+directory. The windows/copydeps.sh script does just that:
+
+```
+$ ./windows/copydeps.sh
+```
+Note that if you made a debug build, all the debug libraries will end up in
+binaries/bin, and there they take almost 1.1G (that's why I'm not publishing
+installer with debug symbols).
+
+You can take the binaries/bin and distribute it as a zip, or create an
+executable installer by invoking NSIS:
+
+```
+$ makensis windows/installer.nsi
+```
+
+### Mac OS X
+
+Running `macdeployqt` should be enough, but for now, there is a bit more work to
+do:
+
+```
+$ cd binaries/bin
+mv plugins merkaartor.app/Contents
+macdeployqt merkaartor.app -dmg
+```
+
+This should give you merkaartor.dmg. Due to a [bug in
+macdeployqt](https://bugreports.qt.io/browse/QTBUG-53738), you might need to
+create the archive manually:
+
+```
+$ hdiutil create "merkaartor.dmg" -srcfolder merkaartor.app -format UDZO -volname merkaartor -verbose -size 130m
+```
+
+But you still need to run `macdeployqt` to copy all the dependencies.
diff --git a/HACKING b/HACKING
deleted file mode 100644
index b4faec1..0000000
--- a/HACKING
+++ /dev/null
@@ -1,11 +0,0 @@
-This are some basic notes on hacking on merkaartor
-
-- fiddling with tagging templates
-	see Templates to add/modify templates
-- adding a language
-	edit Merkaartor.pro and add your language
-	edit Preferences/PreferencesDialog function initLanguages
-	lupdate -> linguist -> lrelease (see the Qt docs about these)
-
-If you want to change the default rendering of any of those
-items see the Styles/Classic.mas file.
diff --git a/HACKING.md b/HACKING.md
new file mode 100644
index 0000000..06fa7e2
--- /dev/null
+++ b/HACKING.md
@@ -0,0 +1,61 @@
+# Hacking Merkaartor
+
+Here are some tips if you want to hack or debug Merkaartor.
+
+## Tag templates
+
+Tag templates are xml files under the Templates directory. See default.mat as a
+refernce. Basically a `widget` tag specifies a choice in the Properties dialog,
+and `value` tags choices for the value. It's not pretty or easy to use.
+
+Before you start hacking, drop an email to the list. I think it's worth adopting
+JOSM presets instead, as we gain pretty exhaustive database and people will have
+easier time switching between Merkaartor/JOSM, which is always good!
+
+## Translations
+
+There is more info in the translations/README.md. However, if you just want to
+contribute to translations either by translating existing language or adding a
+new one, visit our transifex page and start there. There are a few words on our
+web http://merkaartor.be/p/docs/localization , together with link to the
+transifex page.
+
+## Rendering styles
+
+Stored in Styles/ directory, but not to be edited by hand. Use Merkaartor's
+style editor instead, and let it save for you.
+
+If you want to add a new style, do so freely. Keep changes to existing files to
+a minimum, so the overall look, fell and rendering speed won't change much.
+
+I would be very happy if someone made a comprehensive style suited for editing
+POIs, yet easy to navigate.
+
+## Address sanitizer
+
+Can be enabled by:
+
+```
+qmake -r SANITIZE=1
+```
+
+It might complain about some stuff in other libraries (gdal, qt), so keep in
+mind these are not our responsibilities for the most case. Usually all the bugs
+detected are severe and should be reported. Even running Merkaartor with
+sanitizer enabled and reporting bugs is a huge benefit, though there is severe
+performance hit involved.
+
+## Variable naming convention
+
+You might have noticed the strange naming convention for variables. They are
+often prefixed with a definite or indefinite article, like aLayer and theLayer.
+It's been in Merkaartor since the very beginning of git history. I know nothing
+about it, so if you have seen it elsewhere, let me know!
+
+My best bet, based on some observation and common sense is that theVariable
+would represent the same object during it's lifetime. aVariable could change
+objects, for example if it's used in a loop, iterating over layers.
+
+I don't expect anyone to keep this notation in new code, but it might be a good
+idea in some cases. However, I will not accept commits that try to change this
+notation just for the sake of changing.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index b12f00a..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,137 +0,0 @@
-This document is about compiling Merkaartor from source. It's useful if you want
-to tinker with it, want newest version, report bugs, or there is no premade
-package for your distribution. It's not meant as the primary source for regular
-users; please, refer to the README.md on how to get a premade package.
-
-If you still want to build your own Merkaartor, here is how, it's pretty simple:
-
-Prerequisites:
-==============
-
- * Working C++ compiler
- * Qt 4.4.0 or later development environment (for Qt 5.x.y, use qt5 branch)
- * Proj.4
- * GDAL (2.0.0 or newer for GDAL exports)
- * spatialite-4.1.0 or newer for GDAL exports
- * (For Windows Installer) NSIS-3
-
-Linux
------
-
-Do install the packages in question, and if your distribution uses -dev packages
-for development tools, install them too. As there is way too many distributions,
-I won't go into details.
-
-Windows (32bit/64bit)
----------------------
-
-In both cases, you will need to download MSYS2 for your architecture, and
-install some packages from msys shell (msys2_shell.bat).
-
-For 32bit, they are (the w64 is not a bug!):
-
-$ pacman -S base-devel \
-	msys/git \
-	mingw32/mingw-w64-i686-qt5 \
-	mingw32/mingw-w64-i686-gdal \
-	mingw32/mingw-w64-i686-proj \
-	mingw32/mingw-w64-i686-openjpeg2 \
-	mingw32/mingw-w64-i686-json-c
-
-For 64bit, they are:
-
-$ pacman -S base-devel \
-	msys/git \
-	mingw64/mingw-w64-x86_64-qt5 \
-	mingw64/mingw-w64-x86_64-gdal \
-	mingw64/mingw-w64-x86_64-proj \
-	mingw64/mingw-w64-x86_64-openjpeg2 \
-	mingw64/mingw-w64-x86_64-json-c
-
-Done? Continue to the next step, but run a different msys shell, the mingw32 or
-mingw64, based on your architecture. Note that if you'll run mingw32 shell from
-64bit msys installtion, strange stuff will happen, so don't do it.
-
-
-Instructions:
-=============
-
-0. Get the sources, either tarball or git:
-
-$ git clone https://github.com/openstreetmap/merkaartor.git
-
- !  By default, this is the latest development version. If you want to use an older
- !  one, you have to checkout the commit/tag:
- !  
- !  $ git checkout 0.17.0
- !  
- !  Please, use this only for testing (for example, if some feature does not
- !  work, but it did in older release and you want to check which one), never
- !  report bugs for older versions.
-
-1. Change directory to the one in which you unpacked Merkaartor
-
-For example
-$ cd /home/me/src/Merkaartor-0.xx
-
-2. Run qmake
-
-$ qmake -r
-
-Note that you need the Qt4 or Qt5 version of qmake - running the Qt3 version
-will generate incorrect makefiles.  If both are installed, take care to run the
-correct version.  For example, on Fedora/Debian run
-
-$ qmake-qt4
-
-and on (K)ubuntu run
-
-$ /usr/share/qt4/bin/qmake
-
-2.1 Other qmake parameters for Merkaartor.pro
-
-PREFIX=<path>               - base prefix for installation (unix only)
-TRANSDIR_MERKAARTOR=<path>  - where will the Merkaartor translations be installed
-TRANSDIR_SYSTEM=<path>      - where your global Qt translation directory is
-NODEBUG=1                   - release target
-NOUSEWEBKIT                 - disable use of WebKit (Yahoo adapter)
-SYSTEM_QTSA                 - use system copy of qtsingleapplication instead of internal
-SYSTEM_QUAZIP               - use system copy of quazip instead of internal
-SPATIALITE=1                - compile spatialite backend (not working) and
-                              SpatialiteBackground plugin (state unknown). Use
-                              at your own risk.
-
-
-3. Run make.
-
-On Windows:           $ make release
-On other platforms:   $ make
-Debug build:          $ make debug
-
-On Linux, make release fails, as the qmake does not generate proper goal in
-Makefiles, but release is the default. On most Windows installations, the debug
-is the default and we need to specify the release manually. Sorry about that.
-
-4. If you are lucky, you'll find an executable in the binaries subdirectory.
-Otherwise, check our github page [1], especially check the issues and possibly
-report yours.
-
-[1] https://github.com/openstreetmap/merkaartor
-
-5. (Optional: Building Windows Bundle/Installer)
-
-You first have to copy all dependencies of merkaartor to the binaries/bin
-directory. The windows/copydeps.sh script does just that:
-
-$ ./windows/copydeps.sh
-
-You can now copy the directory to a flash drive and carry it with you
-everywhere. Yey! If you need an installer, you'll have to install NSIS 3 and
-compile the windows/installer.nsi
-
-Note that if you made a debug build, all the debug libraries will end up in
-binaries/bin, and there they take almost 1.1G (that's why I'm not publishing
-installer with debug symbols).
-
-
-Bart Vanhauwaert, Ladislav Láska, and others
diff --git a/Icons/128x128/merkaartor.png b/Icons/128x128/merkaartor.png
new file mode 100644
index 0000000..c85f7ea
Binary files /dev/null and b/Icons/128x128/merkaartor.png differ
diff --git a/Icons/16x16/merkaartor.png b/Icons/16x16/merkaartor.png
new file mode 100644
index 0000000..446f0e4
Binary files /dev/null and b/Icons/16x16/merkaartor.png differ
diff --git a/Icons/192x192/merkaartor.png b/Icons/192x192/merkaartor.png
new file mode 100644
index 0000000..2df1b9a
Binary files /dev/null and b/Icons/192x192/merkaartor.png differ
diff --git a/Icons/22x22/merkaartor.png b/Icons/22x22/merkaartor.png
new file mode 100644
index 0000000..83bfb54
Binary files /dev/null and b/Icons/22x22/merkaartor.png differ
diff --git a/Icons/24x24/merkaartor.png b/Icons/24x24/merkaartor.png
new file mode 100644
index 0000000..472b90c
Binary files /dev/null and b/Icons/24x24/merkaartor.png differ
diff --git a/Icons/256x256/merkaartor.png b/Icons/256x256/merkaartor.png
new file mode 100644
index 0000000..ca8de94
Binary files /dev/null and b/Icons/256x256/merkaartor.png differ
diff --git a/Icons/32x32/merkaartor.png b/Icons/32x32/merkaartor.png
new file mode 100644
index 0000000..91621f2
Binary files /dev/null and b/Icons/32x32/merkaartor.png differ
diff --git a/Icons/36x36/merkaartor.png b/Icons/36x36/merkaartor.png
new file mode 100644
index 0000000..d07aef1
Binary files /dev/null and b/Icons/36x36/merkaartor.png differ
diff --git a/Icons/40x40/merkaartor.png b/Icons/40x40/merkaartor.png
new file mode 100644
index 0000000..7b4e3d0
Binary files /dev/null and b/Icons/40x40/merkaartor.png differ
diff --git a/Icons/42x42/merkaartor.png b/Icons/42x42/merkaartor.png
new file mode 100644
index 0000000..b2dfaa2
Binary files /dev/null and b/Icons/42x42/merkaartor.png differ
diff --git a/Icons/512x512/merkaartor.png b/Icons/512x512/merkaartor.png
new file mode 100644
index 0000000..dde4fe7
Binary files /dev/null and b/Icons/512x512/merkaartor.png differ
diff --git a/Icons/64x64/merkaartor.png b/Icons/64x64/merkaartor.png
new file mode 100644
index 0000000..b673b2a
Binary files /dev/null and b/Icons/64x64/merkaartor.png differ
diff --git a/Icons/72x72/merkaartor.png b/Icons/72x72/merkaartor.png
new file mode 100644
index 0000000..763f226
Binary files /dev/null and b/Icons/72x72/merkaartor.png differ
diff --git a/Icons/80x80/merkaartor.png b/Icons/80x80/merkaartor.png
new file mode 100644
index 0000000..9ddcec0
Binary files /dev/null and b/Icons/80x80/merkaartor.png differ
diff --git a/Icons/8x8/merkaartor.png b/Icons/8x8/merkaartor.png
new file mode 100644
index 0000000..b68f5ee
Binary files /dev/null and b/Icons/8x8/merkaartor.png differ
diff --git a/Icons/96x96/merkaartor.png b/Icons/96x96/merkaartor.png
new file mode 100644
index 0000000..268b7bf
Binary files /dev/null and b/Icons/96x96/merkaartor.png differ
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a44d72a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,45 @@
+# Merkaartor
+
+An opensource OSM editor, written in C++ and Qt.
+
+## Health status
+
+| Platform | Status |
+| -------- | ------ |
+| Windows (Tea-CI) | [![Build Status](https://tea-ci.org/api/badges/openstreetmap/merkaartor/status.svg)](https://tea-ci.org/openstreetmap/merkaartor) 
+| Linux and Mac OS X (Travis-CI) | [![Build Status](https://travis-ci.org/openstreetmap/merkaartor.svg?branch=master)](https://travis-ci.org/openstreetmap/merkaartor) |
+
+## Installation
+
+### Binaries
+
+Binary installation files are available for various Linux distributions and Windows. 
+
+These Linux distributions are known to provide current versions of Merkaartor:
+ - Arch (via AUR)
+ - Debian
+ - Fedora
+ - Gentoo
+
+The Windows installer and Mac OS X bundle is available on the website: http://merkaartor.be/p/download
+
+### Source
+
+You can clone this repository to obtain the current development version, or checkout a specific release (all of them are tagged). Detailed instructions can be found in the [COMPILE.md](COMPILE.md) file in this directory.
+
+## Nightly builds
+
+For Windows and Mac OS X, nightly builds are automatically generated using Tea-CI and Travis-CI, uploaded to bintray:
+https://bintray.com/krakonos/nightly/Merkaartor .
+
+There are currently no nightlies for Linux. It's usually easy to compile from
+source, and the vast amount of distributions doesn't make it easy. I'm
+considering making Ubuntu PPA. Let us know if you're interested!
+
+## Hacking the code
+
+I'm always happy to see improvements done by other people. Feel free to
+contribute by sending pull requests for big or small stuff! There is some (very
+little, but it'll grow) useful stuff in [HACKING.md](HACKING.md), but if you
+have questions, contacts us on merkaartor at openstreetmap.org to have them
+answered!
diff --git a/Styles/Merkaartor.mas b/Styles/Merkaartor.mas
new file mode 100644
index 0000000..77c54dc
--- /dev/null
+++ b/Styles/Merkaartor.mas
@@ -0,0 +1,1085 @@
+<mapStyle>
+<global
+/>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ backgroundColor="#bdbdbdff" backgroundScale="0.1" backgroundOffset="0.1"
+ fillColor="#edededfc"
+ labelColor="#333333fc" labelScale="5" labelOffset="5"
+ labelFont="DejaVu Sans,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[area] isoneof (yes , true)"/>
+</painter>
+<painter
+ backgroundColor="#506077fc" backgroundScale="1" backgroundOffset="6"
+ foregroundColor="#809bc0fc" foregroundScale="0.5" foregroundOffset="4"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#333333fc" labelScale="2" labelOffset="4"
+ labelFont="DejaVu Sans,12,-1,5,50,0,0,0,0,0" labelTag="" labelBackgroundColor="#809bc0fc" labelBackgroundTag="ref"
+>
+  <selector expr="[highway] isoneof (motorway , motorway_link)"/>
+</painter>
+<painter
+ backgroundColor="#477147fc" backgroundScale="1.5" backgroundOffset="4"
+ foregroundColor="#7fc97ffc" foregroundScale="1" foregroundOffset="3.5"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#333333fc" labelScale="1.5" labelOffset="4"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelBackgroundColor="#7fc97ffc" labelBackgroundTag="ref"
+>
+  <selector expr="[highway] isoneof (trunk , trunk_link)"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ backgroundColor="#8d4346fc" backgroundScale="1.5" backgroundOffset="4"
+ foregroundColor="#e46d71fc" foregroundScale="1" foregroundOffset="3.5"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#333333fc" labelScale="1.5" labelOffset="4"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelBackgroundColor="#e46d71fc" labelBackgroundTag="ref"
+>
+  <selector expr="[highway] isoneof (primary , primary_link)"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ backgroundColor="#a37b48fc" backgroundScale="1.5" backgroundOffset="3"
+ foregroundColor="#fdbf6ffc" foregroundScale="1" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#333333fc" labelScale="1.3" labelOffset="4"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelBackgroundColor="#fdbf6ffc" labelBackgroundTag="ref"
+>
+  <selector expr="[highway] isoneof (secondary , secondary_link)"/>
+</painter>
+<painter
+ zoomUnder="0.05" zoomUpper="1e+07"
+ backgroundColor="#999999fc" backgroundScale="1.5" backgroundOffset="3"
+ foregroundColor="#ffffccfc" foregroundScale="1" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#333333fc" labelScale="1.2" labelOffset="4"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelBackgroundColor="#ffffccfc" labelBackgroundTag="ref"
+>
+  <selector expr="[highway] isoneof (tertiary , tertiary_link)"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#777777fc" backgroundScale="1.2" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.2" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name">
+  <selector expr="[highway] is residential"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#777777fc" backgroundScale="1.2" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.2" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name">
+  <selector expr="[highway] is unclassified"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#aaaaaafc" backgroundScale="1.1" backgroundOffset="2"
+ foregroundColor="#eeeeeefc" foregroundScale="1" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.1" labelOffset="2"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name">
+  <selector expr="[highway] is construction"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#aaaaaafc" backgroundScale="1.1" backgroundOffset="2"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.1" labelOffset="2"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name">
+  <selector expr="[highway] is road"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#777777fc" backgroundScale="1.2" backgroundOffset="3"
+ foregroundColor="#edededfc" foregroundScale="1" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.2" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name">
+  <selector expr="[highway] is pedestrian"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#ff7777fc" backgroundScale="1" backgroundOffset="1"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="-1"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1" labelOffset="2"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name">
+  <selector expr="[highway] is minor"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ foregroundColor="#777777fc" foregroundScale="0.5" foregroundOffset="0"
+ foregroundDashDown="2" foregroundDashUp="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.1" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[highway] is byway"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ foregroundColor="#777777fc" foregroundScale="0.1" foregroundOffset="0"
+ foregroundDashDown="5" foregroundDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.1" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[highway] is path"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ foregroundColor="#996600fc" foregroundScale="0.5" foregroundOffset="0"
+ foregroundDashDown="2" foregroundDashUp="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.2" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[highway] is track"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ foregroundColor="#0000fffc" foregroundScale="0.3" foregroundOffset="0"
+ foregroundDashDown="1" foregroundDashUp="1.8"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.1" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[highway] is cycleway"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ foregroundColor="#fa8072fc" foregroundScale="0.3" foregroundOffset="0"
+ foregroundDashDown="1" foregroundDashUp="1.8"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1.1" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[highway] is footway"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ foregroundColor="#00ff00fc" foregroundScale="0.4" foregroundOffset="0"
+ foregroundDashDown="2" foregroundDashUp="4"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[highway] is bridleway"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ foregroundColor="#aaaaaafc" foregroundScale="1" foregroundOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000ff" labelScale="1" labelOffset="2"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name">
+  <selector expr="[highway] is living_street"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#636363fc" backgroundScale="0.6" backgroundOffset="1"
+ foregroundColor="#fdfdfdfc" foregroundScale="0.6" foregroundOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[highway] is service"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ foregroundColor="#fa8072fc" foregroundScale="1" foregroundOffset="0"
+ foregroundDashDown="0.2" foregroundDashUp="1.3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[highway] is steps"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/bus_stop.p.12.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[highway] is bus_stop"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/mini_round.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[highway] is mini_roundabout"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/vehicle/restrictions/traffic-light.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[highway] is traffic_signals"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ backgroundColor="#000000fc" backgroundScale="1" backgroundOffset="4"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="2"
+ touchupColor="#000000fc" touchupScale="1" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] is rail"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ backgroundColor="#000000fc" backgroundScale="1" backgroundOffset="4"
+ foregroundColor="#ccccccfc" foregroundScale="1" foregroundOffset="2"
+ touchupColor="#000000fc" touchupScale="1" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] isoneof (abandoned , construction)"/>
+</painter>
+<painter
+ zoomUnder="0.04" zoomUpper="1e+07"
+ backgroundColor="#000000fc" backgroundScale="0.5" backgroundOffset="4"
+ foregroundColor="#fffffffc" foregroundScale="0.5" foregroundOffset="2"
+ touchupColor="#000000fc" touchupScale="0.5" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] is light_rail"/>
+</painter>
+<painter
+ zoomUnder="0.04" zoomUpper="1e+07"
+ backgroundColor="#606060fc" backgroundScale="0.5" backgroundOffset="4"
+ foregroundColor="#fffffffc" foregroundScale="0.5" foregroundOffset="2"
+ touchupColor="#606060fc" touchupScale="0.5" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] is subway"/>
+</painter>
+<painter
+ zoomUnder="0.0666667" zoomUpper="1e+07"
+ backgroundColor="#808080fc" backgroundScale="0.3" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="0.3" foregroundOffset="1"
+ touchupColor="#808080fc" touchupScale="0.3" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] is tram"/>
+</painter>
+<painter
+ zoomUnder="0.0666667" zoomUpper="1e+07"
+ backgroundColor="#808080fc" backgroundScale="0.2" backgroundOffset="2"
+ foregroundColor="#fffffffc" foregroundScale="0.2" foregroundOffset="0.75"
+ touchupColor="#808080fc" touchupScale="0.3" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] is narrow_gauge"/>
+</painter>
+<painter
+ zoomUnder="0.0666667" zoomUpper="1e+07"
+ backgroundColor="#808080fc" backgroundScale="0.3" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="0.3" foregroundOffset="1"
+ touchupColor="#808080fc" touchupScale="0.3" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] is funicular"/>
+</painter>
+<painter
+ zoomUnder="0.0666667" zoomUpper="1e+07"
+ backgroundColor="#d0d0d0fc" backgroundScale="0.3" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="0.3" foregroundOffset="1"
+ touchupColor="#d0d0d0fc" touchupScale="0.3" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] is abandoned"/>
+</painter>
+<painter
+ zoomUnder="0.0666667" zoomUpper="1e+07"
+ backgroundColor="#d0d0d0fc" backgroundScale="0.3" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="0.3" foregroundOffset="1"
+ touchupColor="#d0d0d0fc" touchupScale="0.3" touchupOffset="2"
+ touchupDashDown="3" touchupDashUp="3"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[railway] is disused"/>
+</painter>
+<painter
+ zoomUnder="0.03" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/station.png" iconScale="0" iconOffset="0"
+ labelColor="#6060f0ff" labelScale="7" labelOffset="5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[railway] is station"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/halt.png" iconScale="0" iconOffset="0"
+ labelColor="#6060f0ff" labelScale="7" labelOffset="5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[railway] isoneof (tram_stop , halt)"/>
+</painter>
+<painter
+ zoomUnder="0.0666667" zoomUpper="1e+07"
+ backgroundColor="#808080fc" backgroundScale="0.3" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="0.3" foregroundOffset="1"
+ touchupColor="#808080fc" touchupScale="0.3" touchupOffset="2"
+ touchupDashDown="2" touchupDashUp="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[aerialway] is cable_car"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ fillColor="#b6fdb6cd"
+ labelColor="#333333fc" labelScale="10" labelOffset="6"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[leisure] isoneof (park , garden)"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ fillColor="#8ad3afcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[leisure] is pitch"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ foregroundColor="#770000fc" foregroundScale="0" foregroundOffset="1"
+ fillColor="#ff777777"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[leisure] is track"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#aed1a0cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[natural] is wood"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#aed1a0cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[natural] is meadow"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ foregroundColor="#007700fc" foregroundScale="0" foregroundOffset="1"
+ fillColor="#bccf8f77"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[natural] is scrub"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ foregroundColor="#007700fc" foregroundScale="0" foregroundOffset="1"
+ fillColor="#55994477"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[natural] is heath"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#b5d0d0cd"
+ labelColor="#6699ccfc" labelScale="7" labelOffset="6"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[natural] is water"/>
+</painter>
+<painter
+ fillColor="#b5d0d0cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[natural] is fell"/>
+</painter>
+<painter
+ fillColor="#f2efe9cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[natural] is land"/>
+</painter>
+<painter
+ zoomUnder="0" zoomUpper="1e+07"
+ backgroundColor="#b5d0d0ff" backgroundScale="4" backgroundOffset="4"
+ exterior="yes" foregroundColor="#55aaffff" foregroundScale="0" foregroundOffset="2"
+>
+  <selector expr="[natural] is coastline"/>
+</painter>
+<painter
+ zoomUnder="0.03" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/peak.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="4" labelOffset="9"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[natural] is peak"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/misc/landmark/spring.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[natural] is spring"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ foregroundColor="#797979fc" foregroundScale="0.3" foregroundOffset="1"
+ touchupColor="#000000ff" touchupScale="0.5" touchupOffset="1"
+ touchupDashDown="1" touchupDashUp="1"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[natural] is cliff"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ fillColor="#f7efb7cd"
+ icon=":/Art/Mapnik/parking.png" iconScale="0" iconOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is parking"/>
+</painter>
+<painter
+ zoomUnder="0.05" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/Art/Mapnik/hospital.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="7" labelOffset="5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is hospital"/>
+</painter>
+<painter
+ zoomUnder="0.05" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/health/pharmacy.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is pharmacy"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ foregroundColor="#dbbaabfc" foregroundScale="0" foregroundOffset="1"
+ fillColor="#f0f0d977"
+ labelColor="#333333ff" labelScale="1.5" labelOffset="6"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[amenity] isoneof (school , university)"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/transport/taxi.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is taxi"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/public/arts_centre.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is arts_centre"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/recreation/theater.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is theatre"/>
+</painter>
+<painter
+ fillColor="#aacbafcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[amenity] is grave_yard"/>
+</painter>
+<painter
+ zoomUnder="0.03" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/airport.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is airport"/>
+</painter>
+<painter
+ zoomUnder="0.06" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/post_office.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is post_office"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/post_box.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is post_box"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/pint.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is pub"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/recycling.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is recycling"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/bus_stop.p.12.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is bus_stop"/>
+</painter>
+<painter
+ zoomUnder="0.15" zoomUpper="1e+07"
+ foregroundColor="#111111ff" foregroundScale="0" foregroundOffset="2"
+ fillColor="#77777780"
+ icon=":/Art/Mapnik/place_of_worship.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is place_of_worship"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/shopping/rental/library.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is library"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/food/restaurant.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is restaurant"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/food/snacks.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is fast_food"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/food/cafe.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is cafe"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/recreation/cinema.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is cinema"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/recreation/nightclub.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is nightclub"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/public/telephone.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is telephone"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#ead8bdcd"
+ labelColor="#333333fc" labelScale="7" labelOffset="5.5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[landuse] is vineyard"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#8dc56ccd"
+ fillWithIcon="yes" icon=":/Art/Mapnik/forest.png" iconScale="0" iconOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is forest"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#aaaaaacd"
+ labelColor="#111111fc" labelScale="7" labelOffset="5.5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[landuse] is quarry"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#b5d0d0cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is reservoir"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#ead8bdcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is farm"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#d0eba977"
+ labelColor="#333333fc" labelScale="7" labelOffset="5.5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[landuse] is recreation_ground"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#d0eba977"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is greenfield"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#9d9d6c77"
+ labelColor="#333333fc" labelScale="7" labelOffset="5.5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[landuse] isoneof (brownfield , landfill)"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#d0eba977"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is grass"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#d0eba977"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is village_green"/>
+</painter>
+<painter
+ fillColor="#c8b084cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is allotments"/>
+</painter>
+<painter
+ backgroundColor="#0000fffc" backgroundScale="0" backgroundOffset="3"
+ fillColor="#a0b6ffcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is basin"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#dcdcdc55"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is residential"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#ffaeb9cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is industrial"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#f1dadacd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is retail"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#efc8c8cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is commercial"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#edededcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[landuse] is pedestrian"/>
+</painter>
+<painter
+ fillColor="#aacbafcd"
+ labelColor="#333333fc" labelScale="7" labelOffset="5.5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[landuse] is cemetery"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#d0eba977"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[leisure] is common"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#abdf96cd"
+>
+  <selector expr="[leisure] is nature_reserve"/>
+</painter>
+<painter
+ fillColor="#cc9999cd"
+ labelColor="#333333ff" labelScale="1.5" labelOffset="6"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="building=*"/>
+</painter>
+<painter
+ fillColor="#33cc99cd"
+ labelColor="#333333ff" labelScale="7" labelOffset="5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelArea="yes">
+  <selector expr="[leisure] is stadium"/>
+</painter>
+<painter
+ foregroundColor="#b5d0d0fc" foregroundScale="0" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#6699ccff" labelScale="1.3" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[waterway] isoneof (river , canal)"/>
+</painter>
+<painter
+ foregroundColor="#b5d0d0fc" foregroundScale="0" foregroundOffset="2"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#6699ccff" labelScale="1.1" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[waterway] isoneof (stream , drain)"/>
+</painter>
+<painter
+ fillColor="#b5d0d0cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[waterway] is riverbank"/>
+</painter>
+<painter
+ fillColor="#444444cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[sport] is basketball"/>
+</painter>
+<painter
+ fillColor="#c85656cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[sport] is tennis"/>
+</painter>
+<painter
+ fillColor="#00aa7fcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[sport] is soccer"/>
+</painter>
+<painter
+ fillColor="#00aa7fcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[sport] is football"/>
+</painter>
+<painter
+ fillColor="#00aa7fcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[sport] is athletics"/>
+</painter>
+<painter
+ fillColor="#00aa7fcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[sport] is skating"/>
+</painter>
+<painter
+ fillColor="#00c38fcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[sport] is multi"/>
+</painter>
+<painter
+ backgroundColor="#0000fffc" backgroundScale="0" backgroundOffset="3"
+ fillColor="#a0b6ffcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[sport] is swimming"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#707070fc" backgroundScale="0.1" backgroundOffset="0"
+>
+  <selector expr="[power] is line"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/power_tower.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[power] is tower"/>
+</painter>
+<painter
+ backgroundColor="#505050fc" backgroundScale="0.2" backgroundOffset="0"
+ fillColor="#b0b0b0cd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[power] isoneof (station , sub_station)"/>
+</painter>
+<painter
+ fillColor="#ff8f8fcd"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[military] is barracks"/>
+</painter>
+<painter
+ zoomUnder="0.03" zoomUpper="1e+07"
+ fillColor="#a2ef9477"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[leisure] is playground"/>
+</painter>
+<painter
+ zoomUnder="0.025" zoomUpper="1e+07"
+ backgroundColor="#b0b0c0fc" backgroundScale="4" backgroundOffset="4"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[aeroway] isoneof (runway , taxiway)"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ foregroundColor="#0000fffc" foregroundScale="1" foregroundOffset="0"
+>
+  <selector expr="[route] is ferry"/>
+</painter>
+<painter
+ zoomUnder="0.03" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/tower.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[man_made] is mast"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/Art/Mapnik/tower.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[man_made] is tower"/>
+</painter>
+<painter
+ icon=":/Art/Places/place_town.png" iconScale="0" iconOffset="0"
+ labelColor="#000000dd" labelScale="5" labelOffset="25"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[place] is city"/>
+</painter>
+<painter
+ zoomUnder="0.002" zoomUpper="1e+07"
+ fillColor="#dcdcdc55"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+>
+  <selector expr="[place] is town and  not Type is Node"/>
+</painter>
+<painter
+ zoomUnder="0.00666667" zoomUpper="1e+07"
+ icon=":/Art/Places/place_town.png" iconScale="0" iconOffset="0"
+ labelColor="#000000dd" labelScale="20" labelOffset="12"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[place] is town and Type is Node"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ icon=":/Art/Places/place_village.png" iconScale="0" iconOffset="0"
+ labelColor="#585858dd" labelScale="15" labelOffset="10"
+ labelFont="DejaVu Sans,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[place] is village"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ icon=":/Art/Places/place_village.png" iconScale="0" iconOffset="0"
+ labelColor="#333333dd" labelScale="4" labelOffset="3.5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[place] is suburb"/>
+</painter>
+<painter
+ zoomUnder="0.02" zoomUpper="1e+07"
+ icon=":/Art/Places/place_hamlet.png" iconScale="0" iconOffset="0"
+ labelColor="#333333dd" labelScale="4" labelOffset="3.5"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[place] isoneof (hamlet , locality)"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/shopping/supermarket.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[shop] is supermarket"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/public/firebrigade.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[amenity] is fire_station"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/vehicle/fuel_station.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is fuel"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/money/bank.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] isoneof (bank , atm, bank;atm)"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/accommodation/shelter.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[amenity] is shelter"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/shopping/groceries/bakery.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[shop] is bakery"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/accommodation/hotel.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[tourism] is hotel"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/sightseeing/museum.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[tourism] is museum"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/sightseeing.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[tourism] is attraction"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/recreation/picnic.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[tourism] is picnic_site"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/sightseeing/monument.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[historic] is archaeological_site"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/sightseeing/monument.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[historic] is monument"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/sightseeing/castle.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[historic] is castle"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ icon=":/MapIcons/map-icons/square.small/sightseeing/memorial.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[historic] is memorial"/>
+</painter>
+<painter
+ zoomUnder="0.01" zoomUpper="1e+07"
+ fillColor="#f6666677"
+ icon=":/MapIcons/map-icons/square.small/sightseeing/ruins.png" iconScale="0" iconOffset="0"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[historic] is ruins"/>
+</painter>
+<painter
+ fillColor="#cc9999cd"
+>
+  <selector expr="[amenity] is public_building"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ foregroundColor="#a020f055" foregroundScale="0.3" foregroundOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#000000dd" labelScale="1.1" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[boundary] is administrative"/>
+</painter>
+<painter
+ zoomUnder="0.2" zoomUpper="1e+07"
+ labelColor="#333333ff" labelScale="1.5" labelOffset="8"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="addr:housenumber" labelHalo="yes">
+  <selector expr=" not [addr:housenumber] is _NULL_"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#ff0000fc" backgroundScale="1.2" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="2"
+ icon=":/MapIcons/map-icons/classic.small/vehicle/restrictions/maxheight.png" iconScale="0" iconOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#ff0000ff" labelScale="1.2" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelBackgroundColor="#ffffff7c" labelBackgroundTag="maxheight"
+>
+  <selector expr=" not [maxheight] is _NULL_"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#ff0000fc" backgroundScale="1.2" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="2"
+ icon=":/MapIcons/map-icons/classic.small/vehicle/restrictions/maxwidth.png" iconScale="0" iconOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#0000ffff" labelScale="1.2" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelBackgroundColor="#ffffff7c" labelBackgroundTag="maxwidth"
+>
+  <selector expr=" not [maxwidth] is _NULL_"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#ff0000fc" backgroundScale="1.2" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="2"
+ icon=":/MapIcons/map-icons/classic.small/vehicle/restrictions/maxweight.png" iconScale="0" iconOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#2020ffff" labelScale="1.2" labelOffset="3"
+ labelFont="DejaVu Sans Condensed,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelBackgroundColor="#ffffff7c" labelBackgroundTag="maxweight"
+>
+  <selector expr=" not [maxweight] is _NULL_"/>
+</painter>
+<painter
+ zoomUnder="0.1" zoomUpper="1e+07"
+ backgroundColor="#ff0000fc" backgroundScale="1.2" backgroundOffset="3"
+ foregroundColor="#fffffffc" foregroundScale="1" foregroundOffset="2"
+ icon=":/MapIcons/map-icons/classic.small/vehicle/restrictions/maxlength.png" iconScale="0" iconOffset="0"
+ drawTrafficDirectionMarks="yes" trafficDirectionMarksColor="#000000ff"
+ labelColor="#ff00ffff" labelScale="1.2" labelOffset="3"
+ labelFont="DejaVu Sans,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes" labelBackgroundColor="#ffffff7c" labelBackgroundTag="maxlength"
+>
+  <selector expr=" not [maxlength] is _NULL_"/>
+</painter>
+<painter
+ icon=":/MapIcons/map-icons/square.small/misc/information.png" iconScale="0" iconOffset="0"
+>
+  <selector expr="[tourism] is information"/>
+</painter>
+<painter
+ zoomUnder="0.333333" zoomUpper="1e+07"
+ backgroundColor="#ff00ffff" backgroundScale="2" backgroundOffset="4"
+ labelColor="#333333ff" labelScale="3.5" labelOffset="3"
+ labelFont="DejaVu Sans,12,-1,5,50,0,0,0,0,0" labelTag="name" labelHalo="yes">
+  <selector expr="[Default] Type is Node and HasTags"/>
+</painter>
+</mapStyle>
diff --git a/TODO b/TODO
deleted file mode 100644
index f889272..0000000
--- a/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-- Implement printing (with barcode reference)
-- Implement generalization of Walking Paper plugin to own system
-- Implement GDAL writing
-- Implement GeoTIFF writing
-- Implement transaction log to allow replay after a crash
diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh
new file mode 100755
index 0000000..79975d2
--- /dev/null
+++ b/ci/travis-linux-install.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -ev
+
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1397BC53640DB551
+sudo echo "deb http://archive.ubuntu.com/ubuntu trusty main universe restricted multiverse" \> /etc/apt/sources.list
+sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
+sudo apt-get update -qq
+sudo apt-cache search qt
+sudo apt-get -qq install gdb libgdal-dev libproj-dev
+sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
+sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
+qtchooser -list-versions
diff --git a/ci/travis-linux-script.sh b/ci/travis-linux-script.sh
new file mode 100755
index 0000000..5b68660
--- /dev/null
+++ b/ci/travis-linux-script.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -ev
+
+qtchooser -qt=qt$QT -run-tool=qmake
+make
diff --git a/ci/travis-osx-install.sh b/ci/travis-osx-install.sh
new file mode 100755
index 0000000..194592a
--- /dev/null
+++ b/ci/travis-osx-install.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -ev
+
+brew update
+
+if [ $QT == 4 ]; then
+    QT_PKG=qt
+else
+    QT_PKG=homebrew/versions/qt52
+fi
+
+# Uninstall ALL the GDAL. By default, there are more versions and macdeployqt
+# tried to embed an older one, that relies upon libspatialite.5, that is no
+# longer installed.
+brew uninstall --force gdal
+
+# To get GDAL 2.0: http://gis.stackexchange.com/questions/155403/install-gdal-2-0-on-a-macosx
+#brew install gdal --HEAD
+
+# Gdal and proj are already up to date, libspatialite is probably required by
+# one of them and that screws macdeployqt later on...
+brew install Dylibbundler gdal $QT_PKG
+brew link --force $QT_PKG
+
+find /usr/local -name "qmake*"
+find /usr/local -name "proj_api.h"
diff --git a/ci/travis-osx-script.sh b/ci/travis-osx-script.sh
new file mode 100755
index 0000000..c6d16de
--- /dev/null
+++ b/ci/travis-osx-script.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+set -ev
+
+git tag
+QMAKE=`find /usr/local -name "qmake" | head -n 1`
+$QMAKE SPATIALITE=0
+make
+lrelease src/src.pro
+
+find ./binaries
+
+cd binaries/bin
+mv plugins merkaartor.app/Contents/
+
+which hdiutil
+
+DEPLOY=`find /usr/local -name "macdeployqt" | head -n 1`
+$DEPLOY merkaartor.app -verbose=3
+
+du -s -h merkaartor.app
+hdiutil create "merkaartor.dmg" -srcfolder merkaartor.app -format UDZO -volname merkaartor -verbose -size 130m
+
+VERSION=`git describe --tags`
+mv merkaartor.dmg "merkaartor-${VERSION}-qt${QT}.dmg"
+
+# Prepare deployment description
+cat > deploy.json <<EOF
+{
+    "package": {
+        "name": "Merkaartor",
+        "repo": "nightly",
+        "subject": "krakonos"
+    },
+
+    "version": {
+        "name": "$VERSION"
+    },
+
+    "files":
+        [
+        {"includePattern": "binaries/bin/(merkaartor-.*.dmg)", "uploadPattern":"\$1"}
+        ],
+    "publish": true
+}
+EOF
diff --git a/interfaces/IImageManager.h b/interfaces/IImageManager.h
index 22caaed..1453e3b 100644
--- a/interfaces/IImageManager.h
+++ b/interfaces/IImageManager.h
@@ -62,8 +62,8 @@ class IImageManager
          * @param path the path to the image
          * @return the pixmap of the asked image
          */
-        virtual QImage getImage(IMapAdapter* anAdapter, QString url) = 0;
-        virtual  QByteArray getData(IMapAdapter* anAdapter, QString url) = 0;
+        virtual QImage getImage(IMapAdapter* anAdapter, const QString &url) = 0;
+        virtual QByteArray getData(IMapAdapter* anAdapter, const QString &url) = 0;
 
         //QPixmap prefetchImage(const QString& host, const QString& path);
         virtual QImage prefetchImage(IMapAdapter* anAdapter, int x, int y, int z) = 0;
diff --git a/plugins/background/MCadastreFranceBackground/CadastreFrance.cpp b/plugins/background/MCadastreFranceBackground/CadastreFrance.cpp
index 3791e85..80462f9 100644
--- a/plugins/background/MCadastreFranceBackground/CadastreFrance.cpp
+++ b/plugins/background/MCadastreFranceBackground/CadastreFrance.cpp
@@ -328,7 +328,7 @@ void CadastreFranceAdapter::fromXML(QXmlStreamReader& stream)
 
 QString CadastreFranceAdapter::toPropertiesHtml()
 {
-    return "";
+    return QString();
 }
 
 bool CadastreFranceAdapter::isTiled() const
diff --git a/plugins/background/MCadastreFranceBackground/CadastreFrance.h b/plugins/background/MCadastreFranceBackground/CadastreFrance.h
index 8af0b91..94587a5 100644
--- a/plugins/background/MCadastreFranceBackground/CadastreFrance.h
+++ b/plugins/background/MCadastreFranceBackground/CadastreFrance.h
@@ -96,7 +96,7 @@ public:
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
     virtual int		getAdaptedZoom() const;
     virtual int 	getAdaptedMinZoom(const QRectF &) const;
diff --git a/plugins/background/MGdalBackground/GdalAdapter.cpp b/plugins/background/MGdalBackground/GdalAdapter.cpp
index cc94637..0299411 100644
--- a/plugins/background/MGdalBackground/GdalAdapter.cpp
+++ b/plugins/background/MGdalBackground/GdalAdapter.cpp
@@ -501,7 +501,7 @@ QString GdalAdapter::getSourceTag() const
 
 QString	GdalAdapter::getHost() const
 {
-    return "";
+    return QString();
 }
 
 IMapAdapter::Type GdalAdapter::getType() const
diff --git a/plugins/background/MGdalBackground/GdalAdapter.h b/plugins/background/MGdalBackground/GdalAdapter.h
index 26e9613..5abbe46 100644
--- a/plugins/background/MGdalBackground/GdalAdapter.h
+++ b/plugins/background/MGdalBackground/GdalAdapter.h
@@ -112,7 +112,7 @@ public:
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
     virtual int		getAdaptedZoom() const { return -1; }
     virtual int 	getAdaptedMinZoom(const QRectF &) const { return -1; }
@@ -122,8 +122,8 @@ public:
     virtual void	zoom_out() {}
 
     virtual bool	isValid(int, int, int) const { return true; }
-    virtual QString getQuery(int, int, int)  const { return ""; }
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return ""; }
+    virtual QString getQuery(int, int, int)  const { return QString(); }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return QString(); }
     virtual QPixmap getPixmap(const QRectF& wgs84Bbox, const QRectF& projBbox, const QRect& size) const ;
 
     virtual QString projection() const;
diff --git a/plugins/background/MGeoTiffBackground/GeoTiffAdapter.cpp b/plugins/background/MGeoTiffBackground/GeoTiffAdapter.cpp
index fa8c553..8cee64a 100644
--- a/plugins/background/MGeoTiffBackground/GeoTiffAdapter.cpp
+++ b/plugins/background/MGeoTiffBackground/GeoTiffAdapter.cpp
@@ -269,7 +269,7 @@ QString GeoTiffAdapter::getSourceTag() const
 
 QString	GeoTiffAdapter::getHost() const
 {
-    return "";
+    return QString();
 }
 
 IMapAdapter::Type GeoTiffAdapter::getType() const
diff --git a/plugins/background/MGeoTiffBackground/GeoTiffAdapter.h b/plugins/background/MGeoTiffBackground/GeoTiffAdapter.h
index a032377..bf09d48 100644
--- a/plugins/background/MGeoTiffBackground/GeoTiffAdapter.h
+++ b/plugins/background/MGeoTiffBackground/GeoTiffAdapter.h
@@ -109,7 +109,7 @@ public:
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
     virtual int		getAdaptedZoom() const { return -1; }
     virtual int 	getAdaptedMinZoom(const QRectF &) const { return -1; }
@@ -119,8 +119,8 @@ public:
     virtual void	zoom_out() {}
 
     virtual bool	isValid(int, int, int) const { return true; }
-    virtual QString getQuery(int, int, int)  const { return ""; }
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return ""; }
+    virtual QString getQuery(int, int, int)  const { return QString(); }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return QString(); }
     virtual QPixmap getPixmap(const QRectF& wgs84Bbox, const QRectF& projBbox, const QRect& size) const ;
 
     virtual QString projection() const;
diff --git a/plugins/background/MGosmoreBackground/GosmoreAdapter.cpp b/plugins/background/MGosmoreBackground/GosmoreAdapter.cpp
index 51d38d1..24859e8 100644
--- a/plugins/background/MGosmoreBackground/GosmoreAdapter.cpp
+++ b/plugins/background/MGosmoreBackground/GosmoreAdapter.cpp
@@ -348,8 +348,7 @@ GosmoreAdapter::~GosmoreAdapter()
 
 void GosmoreAdapter::setFile(const QString& fn)
 {
-    if (pak)
-        delete pak;
+    delete pak;
     pak = new QFile(fn, this);
     if (!pak->open(QIODevice::ReadOnly)) {
         QMessageBox::critical(0,QCoreApplication::translate("GosmoreAdapter","No valid file"),QCoreApplication::translate("GosmoreAdapter","File not found."));
@@ -385,7 +384,7 @@ void GosmoreAdapter::onLoadFile()
 
 QString	GosmoreAdapter::getHost() const
 {
-    return "";
+    return QString();
 }
 
 QUuid GosmoreAdapter::getId() const
diff --git a/plugins/background/MGosmoreBackground/GosmoreAdapter.h b/plugins/background/MGosmoreBackground/GosmoreAdapter.h
index 40ff34e..cd0e598 100644
--- a/plugins/background/MGosmoreBackground/GosmoreAdapter.h
+++ b/plugins/background/MGosmoreBackground/GosmoreAdapter.h
@@ -90,14 +90,14 @@ public:
     /*!
      * @return the source tag
      */
-    virtual QString	getSourceTag		() const { return ""; }
+    virtual QString	getSourceTag		() const { return QString(); }
     virtual void setSourceTag (const QString& ) {};
 
     //! returns the Url of the usage license
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
     virtual int		getAdaptedZoom() const { return -1; }
     virtual int 	getAdaptedMinZoom(const QRectF &) const { return -1; }
@@ -107,8 +107,8 @@ public:
     virtual void	zoom_out() {}
 
     virtual bool	isValid(int, int, int) const { return true; }
-    virtual QString getQuery(int, int, int)  const { return ""; }
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return ""; }
+    virtual QString getQuery(int, int, int)  const { return QString(); }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return QString(); }
     virtual QPixmap getPixmap(const QRectF& wgs84Bbox, const QRectF& projBbox, const QRect& size) const ;
 
     virtual QString projection() const;
diff --git a/plugins/background/MMsBingMapBackground/msbingmapadapter.h b/plugins/background/MMsBingMapBackground/msbingmapadapter.h
index 2d5191c..1010141 100644
--- a/plugins/background/MMsBingMapBackground/msbingmapadapter.h
+++ b/plugins/background/MMsBingMapBackground/msbingmapadapter.h
@@ -100,7 +100,7 @@ public:
     virtual int 	getAdaptedMinZoom(const QRectF &bbox) const;
     virtual int		getAdaptedMaxZoom(const QRectF &bbox) const;
 
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect&) const { return ""; }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect&) const { return QString(); }
     virtual bool isTiled() const { return true; }
 
     virtual QRectF	getBoundingbox() const;
@@ -111,7 +111,7 @@ public:
 
     virtual bool toXML(QXmlStreamWriter& /*stream*/) { return true; }
     virtual void fromXML(QXmlStreamReader& /*xParent*/) {}
-    virtual QString toPropertiesHtml() {return "";}
+    virtual QString toPropertiesHtml() {return QString();}
 
     virtual void setSettings(QSettings* aSet) {theSets = aSet;}
 
diff --git a/plugins/background/MNavitBackground/NavitAdapter.cpp b/plugins/background/MNavitBackground/NavitAdapter.cpp
index d96ecb9..49035a3 100644
--- a/plugins/background/MNavitBackground/NavitAdapter.cpp
+++ b/plugins/background/MNavitBackground/NavitAdapter.cpp
@@ -552,7 +552,7 @@ void NavitAdapter::setFile(const QString& fn)
 
 QString	NavitAdapter::getHost() const
 {
-    return "";
+    return QString();
 }
 
 QUuid NavitAdapter::getId() const
diff --git a/plugins/background/MNavitBackground/NavitAdapter.h b/plugins/background/MNavitBackground/NavitAdapter.h
index 2b56e2c..bfb46ab 100644
--- a/plugins/background/MNavitBackground/NavitAdapter.h
+++ b/plugins/background/MNavitBackground/NavitAdapter.h
@@ -89,14 +89,14 @@ public:
     /*!
      * @return the source tag
      */
-    virtual QString	getSourceTag		() const { return ""; }
+    virtual QString	getSourceTag		() const { return QString(); }
     virtual void setSourceTag (const QString& ) {};
 
     //! returns the Url of the usage license
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
     virtual int		getAdaptedZoom() const { return -1; }
     virtual int 	getAdaptedMinZoom(const QRectF &) const { return -1; }
@@ -106,8 +106,8 @@ public:
     virtual void	zoom_out() {}
 
     virtual bool	isValid(int, int, int) const { return true; }
-    virtual QString getQuery(int, int, int)  const { return ""; }
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return ""; }
+    virtual QString getQuery(int, int, int)  const { return QString(); }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return QString(); }
     virtual QPixmap getPixmap(const QRectF& wgs84Bbox, const QRectF& projBbox, const QRect& size) const ;
 
     virtual QString projection() const;
diff --git a/plugins/background/MNavitBackground/NavitBin.cpp b/plugins/background/MNavitBackground/NavitBin.cpp
index b50efa9..0d94495 100644
--- a/plugins/background/MNavitBackground/NavitBin.cpp
+++ b/plugins/background/MNavitBackground/NavitBin.cpp
@@ -29,10 +29,7 @@ NavitBin::NavitBin()
 
 NavitBin::~NavitBin()
 {
-    if (zip) {
-        delete zip;
-        zip = NULL;
-    }
+    delete zip;
 }
 
 bool NavitBin::setFilename(const QString& filename)
diff --git a/plugins/background/MNavitBackground/NavitZip.cpp b/plugins/background/MNavitBackground/NavitZip.cpp
index 50a803b..07b75e5 100644
--- a/plugins/background/MNavitBackground/NavitZip.cpp
+++ b/plugins/background/MNavitBackground/NavitZip.cpp
@@ -27,14 +27,12 @@ NavitZip::NavitZip()
 
 NavitZip::~NavitZip()
 {
-    if (zipFile)
-        delete zipFile;
+    delete zipFile;
 }
 
 void* NavitZip::setZip(QString fn)
 {
-    if (zipFile)
-        delete zipFile;
+    delete zipFile;
     zipFile = new QFile(fn);
     if (!zipFile->open(QIODevice::ReadOnly)) {
         return NULL;
diff --git a/plugins/background/MSpatialiteBackground/SpatialiteAdapter.cpp b/plugins/background/MSpatialiteBackground/SpatialiteAdapter.cpp
index b925baf..b113aac 100644
--- a/plugins/background/MSpatialiteBackground/SpatialiteAdapter.cpp
+++ b/plugins/background/MSpatialiteBackground/SpatialiteAdapter.cpp
@@ -181,7 +181,7 @@ void SpatialiteAdapter::setFile(const QString& fn)
     m_dbName = fn;
     m_loaded = true;
 
-    foreach (QString s, m_tables)
+    foreach (const QString &s, m_tables)
         initTable(s);
 
     emit (forceRefresh());
@@ -189,7 +189,7 @@ void SpatialiteAdapter::setFile(const QString& fn)
 
 QString	SpatialiteAdapter::getHost() const
 {
-    return "";
+    return QString();
 }
 
 QUuid SpatialiteAdapter::getId() const
diff --git a/plugins/background/MSpatialiteBackground/SpatialiteAdapter.h b/plugins/background/MSpatialiteBackground/SpatialiteAdapter.h
index 8aa3454..f4b7d05 100644
--- a/plugins/background/MSpatialiteBackground/SpatialiteAdapter.h
+++ b/plugins/background/MSpatialiteBackground/SpatialiteAdapter.h
@@ -100,14 +100,14 @@ public:
     /*!
      * @return the source tag
      */
-    virtual QString	getSourceTag		() const { return ""; }
+    virtual QString	getSourceTag		() const { return QString(); }
     virtual void setSourceTag (const QString& ) {};
 
     //! returns the Url of the usage license
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
 
     virtual int		getAdaptedZoom() const { return -1; }
@@ -118,8 +118,8 @@ public:
     virtual void	zoom_out() {}
 
     virtual bool	isValid(int, int, int) const { return true; }
-    virtual QString getQuery(int, int, int)  const { return ""; }
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return ""; }
+    virtual QString getQuery(int, int, int)  const { return QString(); }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return QString(); }
     virtual QPixmap getPixmap(const QRectF& wgs84Bbox, const QRectF& projBbox, const QRect& size) const ;
     virtual const QList<IFeature*>* getPaths(const QRectF& wgs84Bbox, const IProjection* projection) const;
 
@@ -172,7 +172,7 @@ private:
 
     mutable QCache<IFeature::FId, IFeature> m_cache;
 
-    QList<QString> m_tables;
+    QStringList m_tables;
 };
 
 class SpatialiteAdapterFactory : public QObject, public IMapAdapterFactory
diff --git a/plugins/background/MWalkingPapersBackground/WalkingPapersAdapter.cpp b/plugins/background/MWalkingPapersBackground/WalkingPapersAdapter.cpp
index e9ece31..b23e47f 100644
--- a/plugins/background/MWalkingPapersBackground/WalkingPapersAdapter.cpp
+++ b/plugins/background/MWalkingPapersBackground/WalkingPapersAdapter.cpp
@@ -155,7 +155,7 @@ bool WalkingPapersAdapter::getWalkingPapersDetails(const QUrl& reqUrl, QRectF& b
 
     QString center = QString::fromLatin1(reply->rawHeader("X-Print-Bounds"));
     QStringList sl = center.split(" ");
-    if (!sl.size() == 4)
+    if (sl.size() != 4)
         return false;
 
     QPointF tl(sl[1].toDouble(), sl[0].toDouble());
@@ -286,7 +286,7 @@ void WalkingPapersAdapter::onLoadImage()
 
 QString	WalkingPapersAdapter::getHost() const
 {
-    return "";
+    return QString();
 }
 
 IMapAdapter::Type WalkingPapersAdapter::getType() const
diff --git a/plugins/background/MWalkingPapersBackground/WalkingPapersAdapter.h b/plugins/background/MWalkingPapersBackground/WalkingPapersAdapter.h
index 62e5d70..6ff198b 100644
--- a/plugins/background/MWalkingPapersBackground/WalkingPapersAdapter.h
+++ b/plugins/background/MWalkingPapersBackground/WalkingPapersAdapter.h
@@ -91,14 +91,14 @@ public:
     /*!
      * @return the source tag
      */
-    virtual QString	getSourceTag		() const { return ""; }
+    virtual QString	getSourceTag		() const { return QString(); }
     virtual void setSourceTag (const QString& ) {};
 
     //! returns the Url of the usage license
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
     virtual int		getAdaptedZoom() const { return -1; }
     virtual int 	getAdaptedMinZoom(const QRectF &) const { return -1; }
@@ -108,8 +108,8 @@ public:
     virtual void	zoom_out() {}
 
     virtual bool	isValid(int, int, int) const { return true; }
-    virtual QString getQuery(int, int, int)  const { return ""; }
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return ""; }
+    virtual QString getQuery(int, int, int)  const { return QString(); }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return QString(); }
     virtual QPixmap getPixmap(const QRectF& wgs84Bbox, const QRectF& projBbox, const QRect& size) const ;
 
     virtual QString projection() const;
diff --git a/plugins/background/MYahooBackground/yahoolegalmapadapter.cpp b/plugins/background/MYahooBackground/yahoolegalmapadapter.cpp
index 1e0e378..f1a8be3 100644
--- a/plugins/background/MYahooBackground/yahoolegalmapadapter.cpp
+++ b/plugins/background/MYahooBackground/yahoolegalmapadapter.cpp
@@ -51,7 +51,7 @@ YahooLegalMapAdapter::~YahooLegalMapAdapter()
 
 QString	YahooLegalMapAdapter::getHost() const
 {
-    return "";
+    return QString();
 }
 
 QUuid YahooLegalMapAdapter::getId() const
@@ -77,7 +77,7 @@ QString YahooLegalMapAdapter::projection() const
 QString YahooLegalMapAdapter::getQuery(const QRectF& wgs84Bbox, const QRectF& /*projBbox*/, const QRect& size) const
 {
     if (size.width() < 150 || size.height() < 150)
-        return "";
+        return QString();
 
     return QString()
                         .append("qrc:/Html/ymap.html?")
diff --git a/plugins/background/MYahooBackground/yahoolegalmapadapter.h b/plugins/background/MYahooBackground/yahoolegalmapadapter.h
index 5d512ce..26f3b24 100644
--- a/plugins/background/MYahooBackground/yahoolegalmapadapter.h
+++ b/plugins/background/MYahooBackground/yahoolegalmapadapter.h
@@ -94,7 +94,7 @@ public:
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
     virtual int		getAdaptedZoom() const { return -1; }
     virtual int 	getAdaptedMinZoom(const QRectF &) const { return -1; }
@@ -104,7 +104,7 @@ public:
     virtual void	zoom_out() {}
 
     virtual bool	isValid(int, int, int) const { return true; }
-    virtual QString getQuery(int, int, int)  const { return ""; }
+    virtual QString getQuery(int, int, int)  const { return QString(); }
     virtual QString getQuery(const QRectF& wgs84Bbox, const QRectF& projBbox, const QRect& size) const ;
     virtual QPixmap getPixmap(const QRectF& /* wgs84Bbox */, const QRectF& /* projBbox */, const QRect& /* size */) const { return QPixmap(); }
 
@@ -124,7 +124,7 @@ public:
 
     virtual bool toXML(QXmlStreamWriter& /*stream*/) { return true; }
     virtual void fromXML(QXmlStreamReader& /*xParent*/) {}
-    virtual QString toPropertiesHtml() {return "";}
+    virtual QString toPropertiesHtml() {return QString();}
 
     virtual void setSettings(QSettings* /*aSet*/) {}
 
diff --git a/plugins/background/MYahooTiledBackground/yahootiledmapadapter.cpp b/plugins/background/MYahooTiledBackground/yahootiledmapadapter.cpp
index 77496fb..c61bb3b 100644
--- a/plugins/background/MYahooTiledBackground/yahootiledmapadapter.cpp
+++ b/plugins/background/MYahooTiledBackground/yahootiledmapadapter.cpp
@@ -52,7 +52,7 @@ YahooTiledMapAdapter::YahooTiledMapAdapter()
     : theImageManager(0)
 
 {
-    host = "";
+    host.clear();
     serverPath = "qrc:/Html/ymap.html?";
     tilesize = 512;
     max_zoom = 17;
@@ -69,7 +69,7 @@ YahooTiledMapAdapter::~YahooTiledMapAdapter()
 
 QString	YahooTiledMapAdapter::getHost() const
 {
-    return "";
+    return QString();
 }
 
 QUuid YahooTiledMapAdapter::getId() const
diff --git a/plugins/background/MYahooTiledBackground/yahootiledmapadapter.h b/plugins/background/MYahooTiledBackground/yahootiledmapadapter.h
index 0ac6292..200df5e 100644
--- a/plugins/background/MYahooTiledBackground/yahootiledmapadapter.h
+++ b/plugins/background/MYahooTiledBackground/yahootiledmapadapter.h
@@ -103,7 +103,7 @@ public:
     /*!
      * @return the Url of the usage license
      */
-    virtual QString	getLicenseUrl() const {return "";}
+    virtual QString	getLicenseUrl() const {return QString();}
 
     virtual int		getAdaptedZoom()   const;
     virtual int 	getAdaptedMinZoom	(const QRectF &) const;
@@ -114,7 +114,7 @@ public:
 
     virtual bool	isValid(int x, int y, int z) const;
     virtual QString getQuery(int x, int y, int z) const;
-    virtual QString getQuery(const QRectF& /* wgs84Bbox */, const QRectF& /* projBbox */, const QRect& /* size */) const  { return ""; }
+    virtual QString getQuery(const QRectF& /* wgs84Bbox */, const QRectF& /* projBbox */, const QRect& /* size */) const  { return QString(); }
     virtual QPixmap getPixmap(const QRectF& /* wgs84Bbox */, const QRectF& /* projBbox */, const QRect& /* size */) const { return QPixmap(); }
 
     virtual QRectF	getBoundingbox() const;
@@ -133,7 +133,7 @@ public:
 
     virtual bool toXML(QXmlStreamWriter& /*stream*/) { return true; }
     virtual void fromXML(QXmlStreamReader& /*xParent*/) {}
-    virtual QString toPropertiesHtml() {return "";}
+    virtual QString toPropertiesHtml() {return QString();}
 
     virtual void setSettings(QSettings* /*aSet*/) {}
 
diff --git a/plugins/common.pri b/plugins/common.pri
index 332edc4..494d1a7 100644
--- a/plugins/common.pri
+++ b/plugins/common.pri
@@ -18,6 +18,10 @@ include ($$MERKAARTOR_SRC_DIR/src/Config.pri)
 DEFINES += VERSION=\"\\\"$$VERSION\\\"\"
 #DEFINES += REVISION=\"\\\"$$REVISION\\\"\"
 
+# Drop the version for now. If it contains anything else than numbers split by
+# dots, the qt stuff generates invalid *.rc files for plugins.
+VERSION=""
+
 win32-msvc* {
     DEFINES += _USE_MATH_DEFINES
 }
diff --git a/share/Projections.xml b/share/Projections.xml
index fd6179f..648d21c 100644
--- a/share/Projections.xml
+++ b/share/Projections.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <MerkaartorList>
- <Projections creator="Merkaartor 0.14" >
+ <Projections creator="Merkaartor 0.18.2" >
   <Projection name="Mercator (EPSG:3785)" >+proj=merc +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +ellps=WGS84 +datum=WGS84 +no_defs</Projection>
   <Projection name="Mercator (epsg:3785)" deleted="true" >+proj=merc +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +ellps=WGS84 +datum=WGS84 +no_defs</Projection>
   <Projection name="EPSG:4326" deleted="true" >+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +to_meter=0.017453292519943295769236907684886</Projection>
   <Projection name="Latitude/Longitude (EPSG:4326)" >+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +to_meter=0.017453292519943295769236907684886</Projection>
   <Projection name="OSGB36 (EPSG:27700)">+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.999601 +x_0=400000 +y_0=-100000 +ellps=airy +datum=OSGB36 +no_defs</Projection>
+  <Projection name="S-JTSK CZ">+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +pm=greenwich +units=m +no_defs +towgs84=570.8,85.7,462.8,4.998,1.587,5.261,3.56</Projection>
  </Projections>
 </MerkaartorList>
diff --git a/share/TmsServersList.xml b/share/TmsServersList.xml
index 5f0849b..1a0c00e 100644
--- a/share/TmsServersList.xml
+++ b/share/TmsServersList.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0"?>
 <MerkaartorList>
- <TmsServers version="1.1" creator="SVN" >
-  <TmsServer minzoom="0" maxzoom="14" path="/tiles/cycle/%1/%2/%3.png" address="andy.sandbox.cloudmade.com" name="Cycle Map" tilesize="256" />
-  <TmsServer minzoom="0" maxzoom="14" path="/tiles/cycle/%1/%2/%3.png" address="thunderflames.org" name="Gravitystorm Cycle" tilesize="256" />
-  <TmsServer minzoom="12" maxzoom="16" path="/Tiles/maplint/%1/%2/%3.png" address="tah.openstreetmap.org" name="Maplint" tilesize="256" />
-  <TmsServer minzoom="6" maxzoom="15" path="/%1/%2/%3.png" address="npe.openstreetmap.org" name="New Popular Edition (NPE)" tilesize="256" />
-  <TmsServer minzoom="14" maxzoom="14" path="/npe/%1/%2/%3.jpg" address="richard.dev.openstreetmap.org" name="New Popular Edition (NPE) at zoom 14" tilesize="256" />
-  <TmsServer minzoom="12" maxzoom="16" path="/Tiles/maplint/%1/%2/%3.png" address="tah.openstreetmap.org" name="OSM Maplint" tilesize="256" />
-  <TmsServer minzoom="0" maxzoom="17" path="/%1/%2/%3.png" address="tile.openstreetmap.org" name="OSM Mapnik" tilesize="256" />
-  <TmsServer minzoom="0" maxzoom="18" path="/Tiles/tile/%1/%2/%3.png" address="tah.openstreetmap.org" name="OSM T at H" tilesize="256" />
-  <TmsServer minzoom="0" maxzoom="18" path="/tiles/1.0.0/openaerialmap-900913/%1/%2/%3.png" address="tile.openaerialmap.org" name="OpenAerialMap" tilesize="256" />
- <TmsServer minzoom="0" maxzoom="23" path="/maps/nml=Vert&x=%2&y=%3&z=%1" address="www.nearmap.com" name="NearMap" tilesize="256"/>
-  <TmsServer minzoom="0" maxzoom="19" sourcetag="Cnes/Spot Image" tmsBaseUrl="http://spotmaps.youmapps.org/spotmaps4osm/" path="/spotmaps4osm/1.0.0/spotmaps4osm/%1/%2/%3.jpeg" projection="EPSG:4326" address="spotmaps.youmapps.org" licenseurl="http://www.youmapps.org/licenses/EULA-OSM-J-fr.html" name="SPOTMaps (France)" tilesize="256" tmsorigin="true"/>
-  <TmsServer minzoom="0" maxzoom="19" sourcetag="Fugro (2005)" path="/fugro2005/%1/%2/%3.jpg" projection="EPSG:900913" address="fugro.openstreetmap.dk" name="Denmark - Fugro Aerial Imagery" tilesize="256"/>
+ <TmsServers creator="Merkaartor v0.18.2.64">
+  <TmsServer minzoom="0" maxzoom="17" path="/%1/%2/%3.png" projection="EPSG:900913" address="http://tile.openstreetmap.org" name="OSM.org Mapnik" tilesize="256"/>
  </TmsServers>
 </MerkaartorList>
diff --git a/share/WmsServersList.xml b/share/WmsServersList.xml
index 711cdc5..04dfed8 100644
--- a/share/WmsServersList.xml
+++ b/share/WmsServersList.xml
@@ -1,18 +1,7 @@
 <?xml version="1.0"?>
 <MerkaartorList>
- <WmsServers version="1.0" creator="SVN" >
-  <WmsServer styles="," layers="Countries,Borders,Highways,Roads,Cities" projections="EPSG:4326" format="image/png" path="/wms/wms.asp?wms=WorldMap&" address="www2.demis.nl" name="Demis" />
-  <WmsServer styles="," layers="DOP20" projections="EPSG:4326" format="image/png" path="/wms/?SERVICE=WMS&" address="oberpfalz.geofabrik.de" name="Oberpfalz Germany" />
-  <WmsServer styles="," layers="DOP20" projections="EPSG:4326" format="image/png" path="/wms?" address="oberpfalz.geofabrik.de" name="Oberpfalz_DOP20" />
-  <WmsServer styles="," layers="world" projections="EPSG:4326" format="image/jpeg" path="/wms/?" address="openaerialmap.org" name="OpenAerialMap" deleted="true"/>
-  <WmsServer styles="," layers="world" projections="EPSG:4326" format="image/jpeg" path="/wms/?" address="opentopomap.org" name="OpenTopoMap" deleted="true" />
-  <WmsServer styles="," layers="doq" projections="EPSG:4326" format="image/jpeg" path="/ogcmap.ashx?" address="terraservice.net" name="Terraservice_DOQ" />
-  <WmsServer styles="," layers="drg" projections="EPSG:4326" format="image/jpeg" path="/ogcmap.ashx?" address="terraservice.net" name="Terraservice_DRG" />
-  <WmsServer styles="," layers="urbanarea" projections="EPSG:4326" format="image/jpeg" path="/ogcmap.ashx?" address="terraservice.net" name="Terraservice_Urban" />
-  <WmsServer styles="," layers="Wohnstrasse,Wege,Zufahrtswege,Landstrasse,Bundesstrasse,Kraftfahrstrasse,Autobahn" projections="EPSG:4326" format="image/png" path="/cgi-bin/mapserv?map=/data/umn/osm/osm_basic.map&SERVICE=WMS&" address="mapbender.wheregroup.com" name="WhereGroup OSM" />
-  <WmsServer styles="" layers="PICC/Voirie,PICC/Voirie mob (l),PICC/Voirie ame,PICC/Voirie,PICC/Voirie mob (p)" projections="EPSG:31370" format="image/png" path="/wmspicc/wms110.do?" address="cartopro2.wallonie.be" name="Wallonie PICC" />
-  <WmsServer styles="" layers="ppnc1,ppnc2,ppnc3,ppnc4,ppnc5,ppnc6,ppnc7" projections="EPSG:31370" format="image/png" path="/WMS/com.esri.wms.Esrimap/PPNC?version1.1.1&" address="cartopro1.wallonie.be" name="Wallonie PPNC" />
-  <WmsServer styles="" layers="osm" projections="EPSG:4326" format="image/png" path="/cgi-bin/c2corg4osm?" address="www.camptocamp.org" name="camptocamp.org" />
-  <WmsServer styles="" layers="GlobeXplorer Image" projections="EPSG:4326" format="image/jpeg" path="/gexservlets/wms?" address="wms.globexplorer.com" name="GlobeXplorer DigitalGlobe" deleted="true" />
+ <WmsServers creator="Merkaartor v0.18.2.64">
+  <WmsServer styles=",,,,,,,,,,,,,,,,,,," layers="Bathymetry,Countries,Topography,Hillshading,Builtup areas,Coastlines,Waterbodies,Inundated,Rivers,Streams,Railroads,Highways,Roads,Trails,Borders,Cities,Settlements,Spot elevations,Airports,Ocean features" projections="EPSG:4326" format="image/png" path="/wms/wms.asp?wms=WorldMap&&VERSION=1.1.1&SERVICE=WMS&LAYERS=Bathymetry,Countries,Topography,Hillshading,Builtup areas,Coastlines,Waterbodies,Inundated,Rivers,Streams,Railr [...]
+  <WmsServer styles=",," layers="spot,landsat,irs" projections="EPSG:3785" format="image/jpeg" path="/?layers=landsat& &VERSION=1.1.1&SERVICE=WMS&LAYERS=spot,landsat,irs&SRS=EPSG:3785&STYLES=,,&FORMAT=image/jpeg" address="irs.gis-lab.info" name="[World] GIS-LAB.info tWMS service"/>
  </WmsServers>
 </MerkaartorList>
diff --git a/src/Backend/MemoryBackend.cpp b/src/Backend/MemoryBackend.cpp
index 54009a7..ba99aa0 100644
--- a/src/Backend/MemoryBackend.cpp
+++ b/src/Backend/MemoryBackend.cpp
@@ -1,6 +1,8 @@
 #include "MemoryBackend.h"
 #include "RTree.h"
 
+#include <QReadWriteLock>
+
 RenderPriority NodePri(RenderPriority::IsSingular,0., 0);
 RenderPriority SegmentPri(RenderPriority::IsLinear,0.,99);
 
@@ -23,6 +25,14 @@ typedef RTree<Feature*, qreal, 2, qreal, 32> CoordTree;
 class MemoryBackendPrivate
 {
 public:
+
+    /* If locked, deletes are delayed. */
+    QReadWriteLock delayedDeletesLock;
+
+    /* Protects the toBeDeleted */
+    QMutex toBeDeletedLock;
+    QList<Feature*> toBeDeleted;
+
     QHash<Feature*, CoordBox> AllocFeatures;
     QHash<ILayer*, CoordTree*> theRTree;
     QList<Feature*> findResult;
@@ -188,13 +198,9 @@ MemoryBackend::~MemoryBackend()
 Node * MemoryBackend::allocNode(ILayer* l, const Node& other)
 {
     Node* f;
-    try {
-        f = new Node(other);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) Node(other);
+    if (!f)
         return NULL;
-    }
 
     p->AllocFeatures[f] = f->BBox;
     if (!f->BBox.isNull()) {
@@ -206,13 +212,10 @@ Node * MemoryBackend::allocNode(ILayer* l, const Node& other)
 Node * MemoryBackend::allocNode(ILayer* l, const QPointF& aCoord)
 {
     Node* f;
-    try {
-        f = new Node(aCoord);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) Node(aCoord);
+    if (!f)
         return NULL;
-    }
+
     p->AllocFeatures[f] = f->BBox;
     if (!f->BBox.isNull()) {
         indexAdd(l, f->BBox, f);
@@ -223,13 +226,10 @@ Node * MemoryBackend::allocNode(ILayer* l, const QPointF& aCoord)
 TrackNode * MemoryBackend::allocTrackNode(ILayer* l, const QPointF& aCoord)
 {
     TrackNode* f;
-    try {
-        f = new TrackNode(aCoord);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) TrackNode(aCoord);
+    if (!f)
         return NULL;
-    }
+
     p->AllocFeatures[f] = f->BBox;
     if (!f->BBox.isNull()) {
         indexAdd(l, f->BBox, f);
@@ -240,13 +240,10 @@ TrackNode * MemoryBackend::allocTrackNode(ILayer* l, const QPointF& aCoord)
 PhotoNode * MemoryBackend::allocPhotoNode(ILayer* l, const QPointF& aCoord)
 {
     PhotoNode* f;
-    try {
-        f = new PhotoNode(aCoord);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) PhotoNode(aCoord);
+    if (!f)
         return NULL;
-    }
+
     p->AllocFeatures[f] = f->BBox;
     if (!f->BBox.isNull()) {
         indexAdd(l, f->BBox, f);
@@ -257,13 +254,9 @@ PhotoNode * MemoryBackend::allocPhotoNode(ILayer* l, const QPointF& aCoord)
 PhotoNode * MemoryBackend::allocPhotoNode(ILayer* l, const Node& other)
 {
     PhotoNode* f;
-    try {
-        f = new PhotoNode(other);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) PhotoNode(other);
+    if (!f)
         return NULL;
-    }
 
     p->AllocFeatures[f] = f->BBox;
     if (!f->BBox.isNull()) {
@@ -275,13 +268,9 @@ PhotoNode * MemoryBackend::allocPhotoNode(ILayer* l, const Node& other)
 PhotoNode * MemoryBackend::allocPhotoNode(ILayer* l, const TrackNode& other)
 {
     PhotoNode* f;
-    try {
-        f = new PhotoNode(other);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) PhotoNode(other);
+    if (!f)
         return NULL;
-    }
 
     p->AllocFeatures[f] = f->BBox;
     if (!f->BBox.isNull()) {
@@ -292,27 +281,16 @@ PhotoNode * MemoryBackend::allocPhotoNode(ILayer* l, const TrackNode& other)
 
 Node * MemoryBackend::allocVirtualNode(const QPointF& aCoord)
 {
-    Node* f;
-    try {
-        f = new Node(aCoord);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
-        return NULL;
-    }
-    return f;
+    return new (std::nothrow) Node(aCoord);
 }
 
 Way * MemoryBackend::allocWay(ILayer* /*l*/)
 {
     Way* f;
-    try {
-        f = new Way();
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) Way();
+    if (!f)
         return NULL;
-    }
+
     p->AllocFeatures[f] = CoordBox();
     return f;
 }
@@ -320,13 +298,10 @@ Way * MemoryBackend::allocWay(ILayer* /*l*/)
 Way * MemoryBackend::allocWay(ILayer* /*l*/, const Way& other)
 {
     Way* f;
-    try {
-        f = new Way(other);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) Way(other);
+    if (!f)
         return NULL;
-    }
+
     p->AllocFeatures[f] = CoordBox();
     return f;
 }
@@ -334,13 +309,10 @@ Way * MemoryBackend::allocWay(ILayer* /*l*/, const Way& other)
 Relation * MemoryBackend::allocRelation(ILayer* /*l*/)
 {
     Relation* f;
-    try {
-        f = new Relation();
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) Relation();
+    if (!f)
         return NULL;
-    }
+
     p->AllocFeatures[f] = CoordBox();
     return f;
 }
@@ -348,13 +320,10 @@ Relation * MemoryBackend::allocRelation(ILayer* /*l*/)
 Relation * MemoryBackend::allocRelation(ILayer* /*l*/, const Relation& other)
 {
     Relation* f;
-    try {
-        f = new Relation(other);
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) Relation(other);
+    if (!f)
         return NULL;
-    }
+
     p->AllocFeatures[f] = CoordBox();
     return f;
 }
@@ -362,28 +331,58 @@ Relation * MemoryBackend::allocRelation(ILayer* /*l*/, const Relation& other)
 TrackSegment * MemoryBackend::allocSegment(ILayer* /*l*/)
 {
     TrackSegment* f;
-    try {
-        f = new TrackSegment();
-        if (!f)
-            return NULL;
-    } catch (...) { // Out-of-memory?
+    f = new (std::nothrow) TrackSegment();
+    if (!f)
         return NULL;
-    }
+
     p->AllocFeatures[f] = CoordBox();
     return f;
 }
 
 void MemoryBackend::deallocFeature(ILayer* l, Feature *f)
 {
+    p->delayedDeletesLock.lockForRead();
+    p->toBeDeletedLock.lock();
     if (p->AllocFeatures.contains(f)) {
         indexRemove(l, p->AllocFeatures[f], f);
-        p->AllocFeatures.remove(f);
+        if (!p->AllocFeatures.remove(f)) {
+            qWarning() << "Feature, that is not in a list is being removed.";
+        } else {
+            p->toBeDeleted.append(f);
+        }
+    }
+    p->toBeDeletedLock.unlock();
+    p->delayedDeletesLock.unlock();
+}
+
+void MemoryBackend::purge()
+{
+    if (p->toBeDeleted.empty()) return; /* Don't bother if there is nothing to delete */
+    if (!p->delayedDeletesLock.tryLockForWrite()) return; /* If locked, deletes need to be delayed */
+    p->toBeDeletedLock.lock();
+    QList<Feature*>::iterator it = p->toBeDeleted.begin();
+    while (it != p->toBeDeleted.end()) {
+        delete *(it++);
     }
+    p->toBeDeleted.clear();
+    p->toBeDeletedLock.unlock();
+    p->delayedDeletesLock.unlock();
+}
+
+void MemoryBackend::delayDeletes() {
+    p->delayedDeletesLock.lockForRead();
+}
+
+void MemoryBackend::resumeDeletes() {
+    p->delayedDeletesLock.unlock();
+    purge();
 }
 
 void MemoryBackend::deallocVirtualNode(Feature *f)
 {
-    delete f;
+    p->delayedDeletesLock.tryLockForRead();
+    p->toBeDeleted.append(f);
+    p->delayedDeletesLock.unlock();
 }
 
 void MemoryBackend::sync(Feature *f)
diff --git a/src/Backend/MemoryBackend.h b/src/Backend/MemoryBackend.h
index 715b1df..dc3933d 100644
--- a/src/Backend/MemoryBackend.h
+++ b/src/Backend/MemoryBackend.h
@@ -42,6 +42,9 @@ public:
     virtual void deallocVirtualNode(Feature* f);
 
     virtual void sync(Feature* f);
+    virtual void purge();
+    virtual void delayDeletes();
+    virtual void resumeDeletes();
 
     virtual const QList<Feature*>& indexFind(ILayer* l, const QRectF& vp);
     virtual void indexFind(ILayer* l, const QRectF& bb, const IndexFindContext& findResult);
diff --git a/src/Commands/Command.cpp b/src/Commands/Command.cpp
index 526467e..bf4e05e 100644
--- a/src/Commands/Command.cpp
+++ b/src/Commands/Command.cpp
@@ -20,7 +20,7 @@
 #include <QList>
 
 Command::Command(Feature* aF)
-    : mainFeature(aF), commandDirtyLevel(0), oldCreated(""), isUndone(false)
+    : mainFeature(aF), commandDirtyLevel(0), isUndone(false)
 {
     description = QApplication::translate("Command", "No description");
 }
@@ -36,7 +36,7 @@ void Command::setId(const QString& id)
 
 const QString& Command::id() const
 {
-    if (Id == "")
+    if (Id.isEmpty())
         Id = QUuid::createUuid().toString();
     return Id;
 }
@@ -156,8 +156,7 @@ CommandList::CommandList(QString aDesc, Feature* aFeat)
 
 CommandList::~CommandList(void)
 {
-    for (int i=0; i<Subs.size(); ++i)
-        delete Subs[i];
+    qDeleteAll(Subs);
 }
 
 void CommandList::setReversed(bool val)
@@ -348,8 +347,7 @@ void CommandHistory::cleanup()
     //FIXME Is there a point to this?
     //for (int i=Index; i<Subs.size(); ++i)
     //	Subs[i]->redo();
-    for (int i=0; i<Subs.size(); ++i)
-        delete Subs[i];
+    qDeleteAll(Subs);
     Subs.clear();
     Index = 0;
     Size = 0;
diff --git a/src/Config.pri b/src/Config.pri
index 80e35b6..bbfa556 100644
--- a/src/Config.pri
+++ b/src/Config.pri
@@ -1,7 +1,12 @@
 # see http://merkaartor.be/wiki/merkaartor/Compiling
 
-REVISION = $$system(git describe --tags)
-VERSION = $$system(git describe --tags | sed "'s/-g.*//;s/-/./g'")
+REVISION = $$system( git describe --tags )
+VERSION = $$system( git describe --tags HEAD | sed "'s/-g.*//;s/-/./g'" )
+isEmpty( REVISION ) {
+	REVISION = $$system(head -n 1 ../CHANGELOG | sed "'s/^v//'")
+	VERSION = $$REVISION
+}
+
 ARCH=""
 BITS=""
 win32 {
@@ -31,3 +36,10 @@ win32 {
 }
 
 QMAKE_CXXFLAGS_WARN_ON += -Wno-reorder
+
+# Append buildflags set in the environment
+QMAKE_CPPFLAGS += $$(CPPFLAGS)
+QMAKE_CFLAGS   += $$(CFLAGS) $$(CPPFLAGS)
+QMAKE_CXXFLAGS += $$(CXXFLAGS) $$(CPPFLAGS)
+QMAKE_LFLAGS   += $$(LDFLAGS)
+
diff --git a/src/Docks/DirtyDock.ui b/src/Docks/DirtyDock.ui
index c547ca9..8f62ac8 100644
--- a/src/Docks/DirtyDock.ui
+++ b/src/Docks/DirtyDock.ui
@@ -34,11 +34,7 @@
         <item>
          <widget class="QLabel" name="label">
           <property name="text">
-           <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></string>
+           <string>There are <b>no</b> dirty objects.</string>
           </property>
           <property name="wordWrap">
            <bool>true</bool>
diff --git a/src/Docks/FeaturesDock.cpp b/src/Docks/FeaturesDock.cpp
index 690c7eb..fa57865 100644
--- a/src/Docks/FeaturesDock.cpp
+++ b/src/Docks/FeaturesDock.cpp
@@ -59,9 +59,12 @@ FeaturesDock::FeaturesDock(MainWindow* aParent)
     connect(ui.FeaturesList, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(on_FeaturesList_customContextMenuRequested(const QPoint &)));
 
     connect(ui.cbWithin, SIGNAL(stateChanged(int)), this, SLOT(on_rbWithin_stateChanged(int)));
+    connect(ui.cbSelectionFilter, SIGNAL(stateChanged(int)), this, SLOT(on_rbSelectionFilter_stateChanged(int)));
     connect(ui.btFind, SIGNAL(clicked(bool)), SLOT(on_btFind_clicked(bool)));
     connect(ui.btReset, SIGNAL(clicked(bool)), SLOT(on_btReset_clicked(bool)));
 
+    connect(Main->properties(), SIGNAL(selectionChanged()), this, SLOT(updateList()));
+
     centerAction = new QAction(NULL, this);
     connect(centerAction, SIGNAL(triggered()), this, SLOT(on_centerAction_triggered()));
     centerZoomAction = new QAction(NULL, this);
@@ -170,6 +173,13 @@ void FeaturesDock::on_rbWithin_stateChanged ( int state )
     updateList();
 }
 
+void FeaturesDock::on_rbSelectionFilter_stateChanged ( int state )
+{
+    M_PREFS->setFeaturesSelectionFilter((state == Qt::Checked));
+
+    updateList();
+}
+
 void FeaturesDock::on_centerAction_triggered()
 {
     Feature* F;
@@ -299,6 +309,11 @@ void FeaturesDock::tabChanged(int idx)
     ui.FeaturesList->clear();
     Highlighted.clear();
 
+    if (curFeatType == IFeature::OsmRelation)
+        ui.cbSelectionFilter->setEnabled(true);
+    else
+        ui.cbSelectionFilter->setEnabled(false);
+
     updateList();
 }
 
@@ -314,29 +329,42 @@ void FeaturesDock::addItem(MapFeaturePtr F)
     if (ui.FeaturesList->count() > MAX_FEATS)
         return;
 
-    if (Highlighted.contains(F))
-        return;
+    QListWidgetItem* newItem = NULL;
 
     if (curFeatType == IFeature::OsmRelation || curFeatType == Feature::All)
     {
-        if (Relation* L = CAST_RELATION(F)) {
-            QListWidgetItem* anItem = new QListWidgetItem(L->description(), ui.FeaturesList);
-            anItem->setData(Qt::UserRole, QVariant::fromValue(F));
+        if (Relation* R = CAST_RELATION(F)) {
+            /* Include all relations if nothing is selected, otherwisde only the
+             * intersection of selected items and relations */
+            bool includeThis;
+            if ((Main->properties()->selection().size() > 0) && (ui.cbSelectionFilter->isChecked())) {
+                includeThis = false;
+                foreach (Feature* sel, Main->properties()->selection()) {
+                    if (R->find(sel) < R->size()) {
+                        includeThis = true;
+                        break;
+                    }
+                }
+            } else includeThis = true;
+
+            if (includeThis) {
+                newItem = new QListWidgetItem(R->description(), ui.FeaturesList);
+            }
         }
     }
     if (curFeatType == IFeature::LineString || curFeatType == IFeature::Polygon || curFeatType == Feature::All)
     {
-        if (Way* R = CAST_WAY(F)) {
-            QListWidgetItem* anItem = new QListWidgetItem(R->description(), ui.FeaturesList);
-            anItem->setData(Qt::UserRole, QVariant::fromValue(F));
-        }
+        if (Way* R = CAST_WAY(F))
+            newItem = new QListWidgetItem(R->description(), ui.FeaturesList);
     }
     if (curFeatType == IFeature::Point || curFeatType == Feature::All)
     {
-        if (Node* N = CAST_NODE(F)) {
-            QListWidgetItem* anItem = new QListWidgetItem(N->description(), ui.FeaturesList);
-            anItem->setData(Qt::UserRole, QVariant::fromValue(F));
-        }
+        if (Node* N = CAST_NODE(F))
+            newItem = new QListWidgetItem(N->description(), ui.FeaturesList);
+    }
+    if (newItem) {
+        newItem->setData(Qt::UserRole, QVariant::fromValue(F));
+        if (Highlighted.contains(F)) newItem->setSelected(true);
     }
 }
 
@@ -358,8 +386,7 @@ void FeaturesDock::clearItems()
                 Highlighted.removeOne(F);
             }
         }
-        if (!item->isSelected())
-            delete item;
+        delete item;
     }
 }
 
diff --git a/src/Docks/FeaturesDock.h b/src/Docks/FeaturesDock.h
index 3caaeee..b05d235 100644
--- a/src/Docks/FeaturesDock.h
+++ b/src/Docks/FeaturesDock.h
@@ -30,19 +30,21 @@ public:
 
     ~FeaturesDock();
 
-    void updateList();
 
     Feature* highlighted(int idx);
     QList<Feature*> highlighted();
     int highlightedSize() const;
 
 public slots:
+    void updateList();
+
     void on_FeaturesList_itemSelectionChanged();
     void on_FeaturesList_itemDoubleClicked(QListWidgetItem* item);
     void on_FeaturesList_customContextMenuRequested(const QPoint & pos);
     void on_FeaturesList_delete();
 
     void on_rbWithin_stateChanged ( int state );
+    void on_rbSelectionFilter_stateChanged ( int state );
 
     void on_centerAction_triggered();
     void on_centerZoomAction_triggered();
diff --git a/src/Docks/FeaturesDock.ui b/src/Docks/FeaturesDock.ui
index 06b8967..745fc87 100644
--- a/src/Docks/FeaturesDock.ui
+++ b/src/Docks/FeaturesDock.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>288</width>
-    <height>459</height>
+    <width>292</width>
+    <height>481</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -68,11 +68,14 @@
         </item>
         <item>
          <widget class="QLabel" name="lblOnlyViewport">
-          <property name="text">
+          <property name="toolTip">
            <string>Only features fully within the viewport</string>
           </property>
+          <property name="text">
+           <string>Filter by viewport</string>
+          </property>
           <property name="wordWrap">
-           <bool>true</bool>
+           <bool>false</bool>
           </property>
           <property name="buddy">
            <cstring>cbWithin</cstring>
@@ -102,6 +105,46 @@
           </property>
          </widget>
         </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QCheckBox" name="cbSelectionFilter">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="toolTip">
+           <string>Only show features intersecting current selection.</string>
+          </property>
+          <property name="text">
+           <string>Filter by selection</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+          <property name="buddy">
+           <cstring>cbSelectionFilter</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item>
          <widget class="QToolButton" name="btReset">
           <property name="text">
diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
index c05d09f..519c23c 100644
--- a/src/Docks/GeoImageDock.cpp
+++ b/src/Docks/GeoImageDock.cpp
@@ -12,13 +12,13 @@
 #include <zbar/QZBarImage.h>
 #endif
 
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QProgressDialog>
-#include <QtGui/QClipboard>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QTimeEdit>
-#include <QtWidgets/QDialogButtonBox>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QProgressDialog>
+#include <QClipboard>
+#include <QRadioButton>
+#include <QTimeEdit>
+#include <QDialogButtonBox>
 #include <QFileDialog>
 
 #include <QNetworkAccessManager>
@@ -81,7 +81,7 @@ bool GeoImageDock::getWalkingPapersDetails(const QUrl& reqUrl, double &lat, doub
 
     QString center = QString::fromLatin1(reply->rawHeader("X-Print-Center"));
     QStringList sl = center.split(" ");
-    if (!sl.size() == 3)
+    if (sl.size() != 3)
         return false;
 
     //int z = sl[2].toInt();
@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
 
     Exiv2::Image::AutoPtr image;
     Exiv2::ExifData exifData;
-    bool positionValid = FALSE;
+    bool positionValid = false;
 
     Layer *theLayer;
     if (photoLayer == NULL) {
@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
     double lat = 0.0, lon = 0.0;
     Exiv2::Image::AutoPtr image;
     Exiv2::ExifData exifData;
-    bool positionValid = FALSE;
+    bool positionValid = false;
 
     if (!QFile::exists(file)) {
         return pos;
diff --git a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h
index ab7bbf6..693cfd5 100644
--- a/src/Docks/GeoImageDock.h
+++ b/src/Docks/GeoImageDock.h
@@ -3,12 +3,13 @@
 #include "MainWindow.h"
 #include "Document.h"
 
-#include <QtGui/QPainter>
-#include <QtWidgets/QDockWidget>
-#include <QtGui/QMouseEvent>
-#include <QtWidgets/QShortcut>
+#include <QPainter>
+#include <QDockWidget>
+#include <QMouseEvent>
+#include <QShortcut>
 #include <exiv2/image.hpp>
 #include <exiv2/exif.hpp>
+#include <QDrag>
 
 class ImageView;
 
diff --git a/src/Docks/PropertiesDock.cpp b/src/Docks/PropertiesDock.cpp
index f1ea5f2..0c0151d 100644
--- a/src/Docks/PropertiesDock.cpp
+++ b/src/Docks/PropertiesDock.cpp
@@ -211,7 +211,6 @@ void PropertiesDock::checkMenuStatus()
     Main->ui->relationAddMemberAction->setEnabled(NumRelation && Selection.size() > 1);
     Main->ui->relationRemoveMemberAction->setEnabled((NumRelation && Selection.size() > 1 && NumRelationChild) || IsParentRelation);
     Main->ui->relationAddToMultipolygonAction->setEnabled((NumAreas > 1) || (NumAreas >0 && NumRelation == 1));
-    Main->ui->menuOpenStreetBugs->setEnabled(IsOpenStreetBug);
 
     Main->ui->editCopyAction->setEnabled(Selection.size());
     Main->clipboardChanged();
@@ -244,6 +243,7 @@ void PropertiesDock::setSelection(Feature*aFeature)
     FullSelection = Selection;
     switchUi();
     fillMultiUiSelectionBox();
+    emit selectionChanged();
 }
 
 void PropertiesDock::setMultiSelection(const QList<Feature*>& aFeatureList)
@@ -267,6 +267,7 @@ void PropertiesDock::setMultiSelection(const QList<Feature*>& aFeatureList)
     theModel->setFeature(Current);
     Selection = Current;
     fillMultiUiSelectionBox();
+    emit selectionChanged();
 }
 
 void PropertiesDock::toggleSelection(Feature* S)
@@ -280,6 +281,7 @@ void PropertiesDock::toggleSelection(Feature* S)
     FullSelection = Selection;
     switchUi();
     fillMultiUiSelectionBox();
+    emit selectionChanged();
 }
 
 void PropertiesDock::addSelection(Feature* S)
@@ -291,6 +293,7 @@ void PropertiesDock::addSelection(Feature* S)
     FullSelection = Selection;
     switchUi();
     fillMultiUiSelectionBox();
+    emit selectionChanged();
 }
 
 void PropertiesDock::adjustSelection()
@@ -311,6 +314,7 @@ void PropertiesDock::adjustSelection()
     FullSelection = aSelection;
     if (Selection.size() != cnt)
         switchUi();
+    emit selectionChanged();
 }
 
 bool PropertiesDock::isSelected(Feature *aFeature)
@@ -361,6 +365,7 @@ void PropertiesDock::on_SelectionList_itemSelectionChanged()
         theModel->setFeature(Selection);
         MultiUi.lbStatus->setText(tr("%1/%2 selected item(s)").arg(Selection.size()).arg(FullSelection.size()));
         Main->view()->update();
+        emit selectionChanged();
     }
 }
 
@@ -609,6 +614,7 @@ void PropertiesDock::resetValues()
     theModel->setFeature(Current);
     Selection = Current;
     checkMenuStatus();
+    emit selectionChanged();
 
     /* If we have standard TableViews in the current UI, set it so that the */
     /* first column is the width of the default text (Edit this to add...)  */
diff --git a/src/Docks/PropertiesDock.h b/src/Docks/PropertiesDock.h
index 0e7d9f9..c753b38 100644
--- a/src/Docks/PropertiesDock.h
+++ b/src/Docks/PropertiesDock.h
@@ -41,8 +41,8 @@ class PropertiesDock : public MDockAncestor
         int selectionSize() const;
         void resetValues();
         void checkMenuStatus();
-        bool loadTemplates(const QString& filename = "");
-        bool mergeTemplates(const QString& filename = "");
+        bool loadTemplates(const QString& filename = QString());
+        bool mergeTemplates(const QString& filename = QString());
         bool saveTemplates(const QString& filename);
 
         Feature* highlighted(int idx);
@@ -72,6 +72,9 @@ class PropertiesDock : public MDockAncestor
         void on_template_changed(TagTemplate* aNewTemplate);
         void adjustSelection();
 
+    signals:
+        void selectionChanged();
+
     private:
         void cleanUpUi();
         void switchUi();
diff --git a/src/Features/Feature.cpp b/src/Features/Feature.cpp
index 9916e90..396bbe4 100644
--- a/src/Features/Feature.cpp
+++ b/src/Features/Feature.cpp
@@ -162,7 +162,7 @@ public:
 };
 
 Feature::Feature()
-: MetaUpToDate(false), m_references(0), ReadOnly(false)
+: MetaUpToDate(false), ReadOnly(false)
 {
     p = new FeaturePrivate(this);
     p->Id = IFeature::FId(IFeature::Uninitialized, 0);
@@ -171,7 +171,7 @@ Feature::Feature()
 }
 
 Feature::Feature(const Feature& other)
-: IFeature(other), MetaUpToDate(false), m_references(0), ReadOnly(other.ReadOnly)
+: IFeature(other), MetaUpToDate(false), ReadOnly(other.ReadOnly)
 {
     p = new FeaturePrivate(*other.p);
     p->Id = IFeature::FId(IFeature::Uninitialized, 0);
@@ -834,7 +834,7 @@ QString Feature::toXML(int lvl, QProgressDialog * progress)
         stream.writeEndDocument();
         return xml;
     } else
-        return "";
+        return QString();
 }
 
 void Feature::fromXML(QXmlStreamReader& stream, Feature* F)
diff --git a/src/Features/Feature.h b/src/Features/Feature.h
index 14c7ad5..36d98f0 100644
--- a/src/Features/Feature.h
+++ b/src/Features/Feature.h
@@ -311,13 +311,13 @@ public:
     void notifyParents(int Id);
 
     static void fromXML(QXmlStreamReader& stream, Feature* F);
-    virtual void toXML(QXmlStreamWriter& stream, bool strict, QString changetsetid="");
+    virtual void toXML(QXmlStreamWriter& stream, bool strict, QString changetsetid = QString());
 
     virtual QString toXML(int lvl=0, QProgressDialog * progress=NULL);
-    virtual bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress=NULL, bool strict=false, QString changetsetid="") = 0;
+    virtual bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress=NULL, bool strict=false, QString changetsetid = QString()) = 0;
 
     QString toMainHtml(QString type, QString systemtype);
-    virtual QString toHtml() { return ""; }
+    virtual QString toHtml() { return QString(); }
 
     virtual QString getClass() const = 0;
     virtual char getType() const = 0;
@@ -337,7 +337,9 @@ public:
     static QString stripToOSMId(const IFeature::FId& id);
 
 public:
+#ifdef USE_SPATIALITE
     quint32 internal_id;
+#endif
 
 private:
     FeaturePrivate* p;
@@ -352,8 +354,6 @@ protected:
     bool tagsToXML(QXmlStreamWriter& stream, bool strict);
     static void tagsFromXML(Document* d, Feature* f, QXmlStreamReader& stream);
 
-    long    m_references;
-
     QPainterPath thePath;
 };
 
diff --git a/src/Features/Node.cpp b/src/Features/Node.cpp
index e24dbd6..12c6853 100644
--- a/src/Features/Node.cpp
+++ b/src/Features/Node.cpp
@@ -676,7 +676,7 @@ PhotoNode::PhotoNode(const TrackNode& other)
 
 PhotoNode::~PhotoNode(void)
 {
-    SAFE_DELETE(Photo)
+    delete Photo;
 }
 
 QPixmap PhotoNode::photo() const
@@ -689,7 +689,7 @@ QPixmap PhotoNode::photo() const
 
 void PhotoNode::setPhoto(QPixmap thePhoto)
 {
-    SAFE_DELETE(Photo)
+    delete Photo;
     Photo = new QPixmap(thePhoto.scaled(M_PREFS->getMaxGeoPicWidth(), M_PREFS->getMaxGeoPicWidth(), Qt::KeepAspectRatio));
 }
 
diff --git a/src/Features/Node.h b/src/Features/Node.h
index 83fc4a6..ddbf25a 100644
--- a/src/Features/Node.h
+++ b/src/Features/Node.h
@@ -77,7 +77,7 @@ public:
     Coord position() const;
     void setPosition(const Coord& aCoord);
 
-    bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict=false, QString changetsetid="");
+    bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict=false, QString changetsetid = QString());
     static Node* fromXML(Document* d, Layer* L, QXmlStreamReader& stream);
 
     bool toGPX(QXmlStreamWriter& stream, QProgressDialog * progress, QString element, bool forExport=false);
diff --git a/src/Features/Relation.h b/src/Features/Relation.h
index 442bff5..57af0c1 100644
--- a/src/Features/Relation.h
+++ b/src/Features/Relation.h
@@ -57,7 +57,7 @@ public:
     const QPainterPath& getPath() const;
     void buildPath(Projection const &theProjection);
 
-    virtual bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict=false, QString changetsetid="");
+    virtual bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict=false, QString changetsetid = QString());
     static Relation* fromXML(Document* d, Layer* L, QXmlStreamReader& stream);
 
     virtual QString toHtml();
diff --git a/src/Features/TrackSegment.h b/src/Features/TrackSegment.h
index 9ce2611..f38bed6 100644
--- a/src/Features/TrackSegment.h
+++ b/src/Features/TrackSegment.h
@@ -57,10 +57,10 @@ public:
 
     virtual bool toGPX(QXmlStreamWriter& stream, QProgressDialog * progress, bool forExport=false);
     static TrackSegment* fromGPX(Document* d, Layer* L, QXmlStreamReader& stream, QProgressDialog * progress);
-    virtual bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict=false,QString changetsetid="");
+    virtual bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict=false,QString changetsetid = QString());
     static TrackSegment* fromXML(Document* d, Layer* L, QXmlStreamReader& stream, QProgressDialog * progress);
 
-    virtual QString toHtml() {return "";}
+    virtual QString toHtml() {return QString();}
 
 private:
     TrackSegmentPrivate* p;
diff --git a/src/Features/Way.cpp b/src/Features/Way.cpp
index e8aadbe..fd746f7 100644
--- a/src/Features/Way.cpp
+++ b/src/Features/Way.cpp
@@ -219,7 +219,7 @@ void Way::partChanged(Feature* /*F*/, int ChangeId)
 
 QString Way::description() const
 {
-    QString s(tagValue("name",""));
+    QString s(tagValue("name",QString()));
     if (!s.isEmpty())
         return QString("%1 (%2)").arg(s).arg(id().numId);
     return QString("%1").arg(id().numId);
@@ -416,7 +416,7 @@ void Way::updateMeta()
         return;
 
     bool isArea = false;
-    if (tagValue("highway", "") == "" || tagValue("area", "") != "")
+    if (tagValue("highway", QString()).isEmpty() || !tagValue("area", QString()).isEmpty())
         isArea = (p->Nodes[0] == p->Nodes[p->Nodes.size()-1]);
 
     for (int i=0; (i+1)<p->Nodes.size(); ++i)
@@ -721,15 +721,15 @@ bool Way::toGPX(QXmlStreamWriter& stream, QProgressDialog * progress, bool forEx
 
     if (!forExport)
         stream.writeAttribute("xml:id", xmlId());
-    QString s = tagValue("name","");
+    QString s = tagValue("name",QString());
     if (!s.isEmpty()) {
         stream.writeTextElement("name", s);
     }
-    s = tagValue("_comment_","");
+    s = tagValue("_comment_",QString());
     if (!s.isEmpty()) {
         stream.writeTextElement("cmt", s);
     }
-    s = tagValue("_description_","");
+    s = tagValue("_description_",QString());
     if (!s.isEmpty()) {
         stream.writeTextElement("desc", s);
     }
diff --git a/src/Features/Way.h b/src/Features/Way.h
index d5e3034..a370477 100644
--- a/src/Features/Way.h
+++ b/src/Features/Way.h
@@ -83,7 +83,7 @@ public:
     void buildPath(Projection const &theProjection);
 
     virtual bool toGPX(QXmlStreamWriter& stream, QProgressDialog * progress, bool forExport=false);
-    virtual bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict=false, QString changetsetid="");
+    virtual bool toXML(QXmlStreamWriter& stream, QProgressDialog * progress, bool strict=false, QString changetsetid = QString());
     static Way* fromXML(Document* d, Layer* L, QXmlStreamReader& stream);
 
     virtual QString toHtml();
diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp
index 04889f6..b0c146a 100644
--- a/src/GPS/qgpsdevice.cpp
+++ b/src/GPS/qgpsdevice.cpp
@@ -1056,10 +1056,17 @@ void QGPSDDevice::onDataAvailable()
         satArray[i][0] = satArray[i][1] = satArray[i][2] = 0;
     for (int i=0; i<num_sat; ++i)
     {
+#if GPSD_API_MAJOR_VERSION > 5
+        int id = gpsdata->skyview[i].PRN;
+        satArray[id][0] = gpsdata->skyview[i].elevation;
+        satArray[id][1] = gpsdata->skyview[i].azimuth;
+        satArray[id][2] = gpsdata->skyview[i].ss;
+#else
         int id = gpsdata->PRN[i];
         satArray[id][0] = gpsdata->elevation[i];
         satArray[id][1] = gpsdata->azimuth[i];
         satArray[id][2] = gpsdata->ss[i];
+#endif
     }
     setNumSatellites(num_sat);
 
diff --git a/src/ImportExport/ImportCSVDialog.cpp b/src/ImportExport/ImportCSVDialog.cpp
index 61236ff..b835dae 100644
--- a/src/ImportExport/ImportCSVDialog.cpp
+++ b/src/ImportExport/ImportCSVDialog.cpp
@@ -109,7 +109,7 @@ void ImportCSVDialog::analyze()
             m_quote = "'";
             ui->rbStringSingle->setChecked(true);
         } else {
-            m_quote = "";
+            m_quote.clear();
             ui->rbStringNone->setChecked(true);
         }
 
@@ -319,7 +319,7 @@ void ImportCSVDialog::on_edCustomDelim_textEdited()
 
 void ImportCSVDialog::on_rbStringNone_clicked()
 {
-    m_quote = "";
+    m_quote.clear();
     generatePreview();
 }
 
@@ -430,7 +430,7 @@ bool ImportCSVDialog::import(Layer *aLayer)
 
 void ImportCSVDialog::on_btLoad_clicked()
 {
-    QString f = QFileDialog::getOpenFileName(this, tr("Load CSV import settings"), "", tr("Merkaartor import settings (*.mis)"));
+    QString f = QFileDialog::getOpenFileName(this, tr("Load CSV import settings"), QString(), tr("Merkaartor import settings (*.mis)"));
     if (f.isEmpty())
         return;
 
@@ -500,7 +500,7 @@ void ImportCSVDialog::on_btLoad_clicked()
         item->setData(Qt::UserRole, i);
         ui->lvFields->addItem(item);
     }
-    ui->edFieldName->setText("");
+    ui->edFieldName->setText(QString());
 
     on_edProjection_editingFinished();
 }
diff --git a/src/ImportExport/ImportCSVDialog.ui b/src/ImportExport/ImportCSVDialog.ui
index 38a465f..52197be 100644
--- a/src/ImportExport/ImportCSVDialog.ui
+++ b/src/ImportExport/ImportCSVDialog.ui
@@ -52,17 +52,17 @@
          <bool>true</bool>
         </property>
         <property name="html">
-         <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+         <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></string>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></string>
+        </property>
+        <property name="acceptRichText">
+         <bool>false</bool>
+        </property>
+        <property name="textInteractionFlags">
+         <set>Qt::TextSelectableByMouse</set>
         </property>
        </widget>
       </item>
diff --git a/src/ImportExport/ImportExportGdal.cpp b/src/ImportExport/ImportExportGdal.cpp
index 4641854..c1b039f 100644
--- a/src/ImportExport/ImportExportGdal.cpp
+++ b/src/ImportExport/ImportExportGdal.cpp
@@ -473,8 +473,7 @@ bool ImportExportGdal::importGDALDataset(GDALDataset* poDS, Layer* aLayer, bool
     QApplication::restoreOverrideCursor();
 #endif
 
-    if (toWGS84)
-        delete toWGS84;
+    delete toWGS84;
 
     if (progress.wasCanceled())
         return false;
@@ -487,16 +486,15 @@ bool ImportExportGdal::import(Layer* aLayer)
 #ifdef GDAL2
     GDALAllRegister();
     GDALDataset *poDS;
-    poDS = (GDALDataset *) GDALOpen( FileName.toUtf8().constData(), GA_ReadOnly );
+    poDS = (GDALDataset *) GDALOpenEx( FileName.toUtf8().constData(), GDAL_OF_VECTOR | GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR, NULL, NULL, NULL );
 #else
     OGRRegisterAll();
     OGRDataSource *poDS;
     poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
 #endif
 
-    if( poDS == NULL )
-    {
-        qDebug( "GDAL Open failed.\n" );
+    if( poDS == NULL ) {
+        //qDebug() << "GDAL Open failed from file " << FileName.toUtf8().constData();
         return false;
     }
 
diff --git a/src/ImportExport/ImportExportOSC.cpp b/src/ImportExport/ImportExportOSC.cpp
index 985af05..d706350 100644
--- a/src/ImportExport/ImportExportOSC.cpp
+++ b/src/ImportExport/ImportExportOSC.cpp
@@ -66,7 +66,7 @@ bool ImportExportOSC::import(Layer* aLayer)
     }
 
     QList<IFeature::FId> featIdList;
-    Feature* F;
+    Feature* F = NULL;
     stream.readNext();
     while(!stream.atEnd() && !stream.isEndElement()) {
         if (stream.name() == "create") {
diff --git a/src/ImportExport/ImportNMEA.cpp b/src/ImportExport/ImportNMEA.cpp
index a82dde1..44d0138 100644
--- a/src/ImportExport/ImportNMEA.cpp
+++ b/src/ImportExport/ImportNMEA.cpp
@@ -209,8 +209,11 @@ TrackNode* ImportNMEA::importRMC (QString line)
 
     QString strDate = tokens[9] + tokens[1];
     QDateTime date = QDateTime::fromString(strDate, "ddMMyyHHmmss.zzz");
-    if (!date.isValid())
+    if (!date.isValid()) date = QDateTime::fromString(strDate, "ddMMyyHHmmss.z");
+    if (!date.isValid()) date = QDateTime::fromString(strDate, "ddMMyyHHmmss");
+    if (!date.isValid()) {
         return NULL;
+    }
 
     if (date.date().year() < 1970)
         date = date.addYears(100);
diff --git a/src/Interactions/CreateNodeInteraction.cpp b/src/Interactions/CreateNodeInteraction.cpp
index 9e30ebb..0c6aec0 100644
--- a/src/Interactions/CreateNodeInteraction.cpp
+++ b/src/Interactions/CreateNodeInteraction.cpp
@@ -21,7 +21,7 @@ CreateNodeInteraction::CreateNodeInteraction(MainWindow* aMain)
 
 CreateNodeInteraction::~CreateNodeInteraction(void)
 {
-    SAFE_DELETE(theMoveInteraction);
+    delete theMoveInteraction;
 }
 
 QString CreateNodeInteraction::toHtml()
diff --git a/src/Interactions/CreateRoundaboutDock.ui b/src/Interactions/CreateRoundaboutDock.ui
index a3667a8..9f5d505 100644
--- a/src/Interactions/CreateRoundaboutDock.ui
+++ b/src/Interactions/CreateRoundaboutDock.ui
@@ -1,37 +1,97 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>CreateRoundaboutDock</class>
- <widget class="QWidget" name="CreateRoundaboutDock" >
-  <property name="geometry" >
+ <widget class="QWidget" name="CreateRoundaboutDock">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>364</width>
-    <height>39</height>
+    <height>142</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
+   <property name="margin">
+    <number>9</number>
+   </property>
    <item>
-    <widget class="QCheckBox" name="DriveRight" >
-     <property name="text" >
-      <string>Driving at the right side of the road</string>
-     </property>
-    </widget>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="3" column="0">
+      <widget class="QLabel" name="precisionLabel">
+       <property name="text">
+        <string>Precision (meters/segment)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Type</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QDoubleSpinBox" name="precision">
+       <property name="decimals">
+        <number>1</number>
+       </property>
+       <property name="minimum">
+        <double>0.100000000000000</double>
+       </property>
+       <property name="value">
+        <double>3.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="type">
+       <item>
+        <property name="text">
+         <string>Roundabout</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Plain circle</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="drivingSide">
+       <item>
+        <property name="text">
+         <string>Left</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Right</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Driving side</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
diff --git a/src/Interactions/CreateRoundaboutInteraction.cpp b/src/Interactions/CreateRoundaboutInteraction.cpp
index c98c752..73d71be 100644
--- a/src/Interactions/CreateRoundaboutInteraction.cpp
+++ b/src/Interactions/CreateRoundaboutInteraction.cpp
@@ -28,15 +28,24 @@ CreateRoundaboutInteraction::CreateRoundaboutInteraction(MainWindow* aMain)
     theDock->setAllowedAreas(Qt::LeftDockWidgetArea);
     theMain->addDockWidget(Qt::LeftDockWidgetArea, theDock);
     theDock->show();
-    DockData.DriveRight->setChecked(M_PREFS->getrightsidedriving());
+    connect(DockData.type, SIGNAL(currentIndexChanged(int)), this, SLOT(on_typeChanged(int)));
+    DockData.drivingSide->setCurrentIndex(M_PREFS->getrightsidedriving());
+    DockData.precision->setValue(M_PREFS->getRoundaboutPrecision());
+    DockData.type->setCurrentIndex(M_PREFS->getRoundaboutType());
 
     theMain->view()->setCursor(cursor());
 #endif
 }
 
+void CreateRoundaboutInteraction::on_typeChanged(int newType) {
+    DockData.drivingSide->setEnabled(newType == 0);
+}
+
 CreateRoundaboutInteraction::~CreateRoundaboutInteraction()
 {
-    M_PREFS->setrightsidedriving(DockData.DriveRight->isChecked());
+    M_PREFS->setrightsidedriving(DockData.drivingSide->currentIndex()); /* 0 is left, 1 is right */
+    M_PREFS->setRoundaboutType(DockData.type->currentIndex());
+    M_PREFS->setRoundaboutPrecision(DockData.precision->value());
     delete theDock;
     view()->update();
 }
@@ -71,19 +80,10 @@ void CreateRoundaboutInteraction::mousePressEvent(QMouseEvent * event)
         }
         else
         {
-            QPointF CenterF(COORD_TO_XY(Center));
-            qreal Radius = distance(CenterF,LastCursor)/view()->pixelPerM();
-            qreal Precision = 2.49;
-            if (Radius<2.5)
-                Radius = 2.5;
-            qreal Angle = 2*acos(1-Precision/Radius);
-            qreal Steps = ceil(2*M_PI/Angle);
-            Angle = 2*M_PI/Steps;
-            Radius *= view()->pixelPerM();
-            qreal Modifier = DockData.DriveRight->isChecked()?-1:1;
-            QBrush SomeBrush(QColor(0xff,0x77,0x11,128));
-            QPen TP(SomeBrush,view()->pixelPerM()*4+1);
-            QPointF Prev(CenterF.x()+cos(Modifier*Angle/2)*Radius,CenterF.y()+sin(Modifier*Angle/2)*Radius);
+            calculatePoints();
+            if (Points.size() == 0) return;
+
+            QPointF Prev = Points[0];
             Node* First = g_backend.allocNode(theMain->document()->getDirtyOrOriginLayer(), XY_TO_COORD(Prev.toPoint()));
             Way* R = g_backend.allocWay(theMain->document()->getDirtyOrOriginLayer());
             CommandList* L  = new CommandList(MainWindow::tr("Create Roundabout %1").arg(R->id().numId), R);
@@ -97,17 +97,16 @@ void CreateRoundaboutInteraction::mousePressEvent(QMouseEvent * event)
             }
             // "oneway" is implied on roundabouts
             //R->setTag("oneway","yes");
-            R->setTag("junction","roundabout");
-            for (qreal a = Angle*3/2; a<2*M_PI; a+=Angle)
-            {
-                QPointF Next(CenterF.x()+cos(Modifier*a)*Radius,CenterF.y()+sin(Modifier*a)*Radius);
+            if (DockData.type->currentIndex() == 0)
+                R->setTag("junction","roundabout");
+            for (int i = 1; i < Points.size(); i++ ) {
+                QPointF Next = Points[i];
                 Node* New = g_backend.allocNode(theMain->document()->getDirtyOrOriginLayer(), XY_TO_COORD(Next.toPoint()));
                 L->add(new AddFeatureCommand(theMain->document()->getDirtyOrOriginLayer(),New,true));
                 R->add(New);
             }
             R->add(First);
-            for (FeatureIterator it(document()); !it.isEnd(); ++it)
-            {
+            for (FeatureIterator it(document()); !it.isEnd(); ++it) {
                 Way* W1 = CAST_WAY(it.get());
                 if (W1 && (W1 != R))
                     Way::createJunction(theMain->document(), L, R, W1, true);
@@ -141,31 +140,45 @@ void CreateRoundaboutInteraction::mouseReleaseEvent(QMouseEvent* anEvent)
     Interaction::mouseReleaseEvent(anEvent);
 }
 
-void CreateRoundaboutInteraction::paintEvent(QPaintEvent* , QPainter& thePainter)
-{
-    if (HaveCenter)
-    {
+void CreateRoundaboutInteraction::calculatePoints() {
+    Points.clear();
+    if (HaveCenter) {
         QPointF CenterF(COORD_TO_XY(Center));
         qreal Radius = distance(CenterF,LastCursor)/view()->pixelPerM();
-        qreal Precision = 1.99;
-        if (Radius<2)
-            Radius = 2;
-        qreal Angle = 2*acos(1-Precision/Radius);
-        qreal Steps = ceil(2*M_PI/Angle);
-        Angle = 2*M_PI/Steps;
+        qreal Precision = DockData.precision->value(); //2.49;
+        /* Let the precision be the approximate number of meters per arc */
+
+        qreal Circumference = 2*M_PI*Radius;
+        qreal Steps = Circumference/Precision;
+        if (Steps < 3) Steps = 3;
+        qreal Angle = 2*M_PI/Steps;
+
+        /* Normalize the radius for drawing */
         Radius *= view()->pixelPerM();
-        qreal Modifier = DockData.DriveRight->isChecked()?-1:1;
-        QBrush SomeBrush(QColor(0xff,0x77,0x11,128));
-        QPen TP(SomeBrush,view()->pixelPerM()*4);
-        QPointF Prev(CenterF.x()+cos(Modifier*Angle/2)*Radius,CenterF.y()+sin(Modifier*Angle/2)*Radius);
-        for (qreal a = Angle*3/2; a<2*M_PI; a+=Angle)
-        {
-            QPointF Next(CenterF.x()+cos(Modifier*a)*Radius,CenterF.y()+sin(Modifier*a)*Radius);
-            ::draw(thePainter,TP,Feature::OneWay, Prev,Next,4,view()->projection());
-            Prev = Next;
+
+        qreal Modifier = DockData.drivingSide->currentIndex() == 1 ? -1:1;
+        for (qreal a = 0; a<2*M_PI; a+=Angle) {
+            QPointF point(CenterF.x()+cos(Modifier*a)*Radius,CenterF.y()+sin(Modifier*a)*Radius);
+            Points.append(point);
         }
-        QPointF Next(CenterF.x()+cos(Modifier*Angle/2)*Radius,CenterF.y()+sin(Modifier*Angle/2)*Radius);
-        ::draw(thePainter,TP,Feature::OneWay, Prev,Next,4,view()->projection());
+    }
+}
+
+void CreateRoundaboutInteraction::paintEvent(QPaintEvent* , QPainter& thePainter)
+{
+    calculatePoints();
+
+    if (Points.size() == 0) return;
+
+    qreal Precision = DockData.precision->value(); //2.49;
+    QBrush SomeBrush(QColor(0xff,0x77,0x11,128));
+    QPen TP(SomeBrush,view()->pixelPerM()*Precision/2);
+
+    for (int i = 0; i < Points.size(); i++) {
+        QPointF Prev = Points[i];
+        QPointF Next = Points[ (i+1)%Points.size() ];
+        ::draw(thePainter, TP, (DockData.type->currentIndex() == 0) ? Feature::OneWay : Feature::BothWays, Prev, Next, Precision, view()->projection());
+        Prev = Next;
     }
 }
 
diff --git a/src/Interactions/CreateRoundaboutInteraction.h b/src/Interactions/CreateRoundaboutInteraction.h
index bb7d33b..5fd6f36 100644
--- a/src/Interactions/CreateRoundaboutInteraction.h
+++ b/src/Interactions/CreateRoundaboutInteraction.h
@@ -23,11 +23,15 @@ class CreateRoundaboutInteraction : public Interaction
 #ifndef _MOBILE
         virtual QCursor cursor() const;
 #endif
+    private slots:
+        void on_typeChanged(int newType);
 
     private:
+        void calculatePoints();
         QDockWidget* theDock;
         Ui::CreateRoundaboutDock DockData;
         Coord Center;
+        QList<QPointF> Points;
         QPointF LastCursor;
         bool HaveCenter;
 };
diff --git a/src/Interactions/Interaction.cpp b/src/Interactions/Interaction.cpp
index 0560f88..ed05b8c 100644
--- a/src/Interactions/Interaction.cpp
+++ b/src/Interactions/Interaction.cpp
@@ -25,7 +25,7 @@
 
 Interaction::Interaction(MainWindow* aMain)
     : QObject(aMain), theMain(aMain), Panning(false)
-    , LastSnap(0), SnapActive(true)
+    , SnapActive(true)
     , NoSelectPoints(false), NoSelectRoads(false), NoSelectVirtuals(true)
     , Dragging(false)
     , StartDrag(0,0), EndDrag(0,0)
@@ -195,17 +195,28 @@ void Interaction::paintEvent(QPaintEvent*, QPainter& thePainter)
     }
 }
 
-void Interaction::updateSnap(QMouseEvent* event)
+void Interaction::mouseEvent(QMouseEvent*) {
+
+}
+
+void FeatureSnapInteraction::mouseEvent(QMouseEvent* event) {
+    updateSnap(event);
+}
+
+void FeatureSnapInteraction::updateSnap(QMouseEvent* event)
 {
     if (panning())
     {
-        LastSnap = 0;
+        clearLastSnap();
         return;
     }
     bool NoRoads =
         ( (QApplication::keyboardModifiers() & Qt::AltModifier) &&  (QApplication::keyboardModifiers() &Qt::ControlModifier) );
-    Feature* Prev = LastSnap;
-    LastSnap = 0;
+
+    /* Beware: Prev shall not be dereferenced after clearLastSnap! */
+    Feature* Prev = lastSnap();
+    clearLastSnap();
+
     Feature* ReadOnlySnap = 0;
     if (!SnapActive) return;
     //QTime Start(QTime::currentTime());
@@ -263,7 +274,7 @@ void Interaction::updateSnap(QMouseEvent* event)
                 if (Distance < BestDistance && !F->isReadonly())
                 {
                     BestDistance = Distance;
-                    LastSnap = F;
+                    setLastSnap( F );
                 } else if (Distance < BestReadonlyDistance && F->isReadonly())
                 {
                     BestReadonlyDistance = Distance;
@@ -273,28 +284,28 @@ void Interaction::updateSnap(QMouseEvent* event)
         }
     }
     if (areNodesSelectable) {
-        R = CAST_WAY(LastSnap);
+        R = CAST_WAY(lastSnap());
         if (R) {
             Node* N = R->pixelDistanceNode(event->pos(), CLEAR_DISTANCE, view(), NoSnap, NoSelectVirtuals);
             if (N)
-                LastSnap = N;
+                setLastSnap( N );
         }
     }
 
-    if (Prev != LastSnap) {
-        curStackSnap = SnapList.indexOf(LastSnap);
+    if (Prev != lastSnap()) {
+        curStackSnap = SnapList.indexOf(lastSnap());
         view()->update();
     }
 
     if (M_PREFS->getMapTooltip()) {
-        if (LastSnap)
-            view()->setToolTip(LastSnap->toHtml());
+        if (lastSnap())
+            view()->setToolTip(lastSnap()->toHtml());
         else
             view()->setToolTip("");
     }
     if (M_PREFS->getInfoOnHover() && main() && theMain->info() && theMain->info()->isVisible()) {
-        if (LastSnap) {
-            theMain->info()->setHoverHtml(LastSnap->toHtml());
+        if (lastSnap()) {
+            theMain->info()->setHoverHtml(lastSnap()->toHtml());
         } else
             if (ReadOnlySnap)
                 theMain->info()->setHoverHtml(ReadOnlySnap->toHtml());
@@ -302,19 +313,14 @@ void Interaction::updateSnap(QMouseEvent* event)
                 theMain->info()->unsetHoverHtml();
     }
 
-    emit featureSnap(LastSnap);
-}
-
-Feature* Interaction::lastSnap()
-{
-    return LastSnap;
+    emit featureSnap(lastSnap());
 }
 
 
 /***************/
 
 FeatureSnapInteraction::FeatureSnapInteraction(MainWindow* aMain)
-        : Interaction(aMain)
+        : Interaction(aMain), LastSnap(0)
 {
 //    handCursor = QCursor(QPixmap(":/Icons/grab.png"));
 //    grabCursor = QCursor(QPixmap(":/Icons/grabbing.png"));
@@ -347,9 +353,9 @@ void FeatureSnapInteraction::paintEvent(QPaintEvent* anEvent, QPainter& thePaint
         theMain->properties()->highlighted(i)->drawHighlight(thePainter, view());
     }
 
-    if (LastSnap) {
-        LastSnap->drawHover(thePainter, view());
-        view()->setToolTip(LastSnap->toHtml());
+    if (lastSnap()) {
+        lastSnap()->drawHover(thePainter, view());
+        view()->setToolTip(lastSnap()->toHtml());
     } else {
         view()->setToolTip("");
     }
@@ -359,8 +365,8 @@ void FeatureSnapInteraction::paintEvent(QPaintEvent* anEvent, QPainter& thePaint
 void FeatureSnapInteraction::mousePressEvent(QMouseEvent * event)
 {
     if (event->button() == Qt::LeftButton)
-        snapMousePressEvent(event,LastSnap);
-    if (!(M_PREFS->getMouseSingleButton() && LastSnap))
+        snapMousePressEvent(event,lastSnap());
+    if (!(M_PREFS->getMouseSingleButton() && lastSnap()))
         Interaction::mousePressEvent(event);
 }
 
@@ -369,8 +375,8 @@ void FeatureSnapInteraction::mouseReleaseEvent(QMouseEvent * event)
     if (event->button() == Qt::RightButton && !Panning && !Dragging)
         emit(requestCustomContextMenu(event->pos()));
 
-    snapMouseReleaseEvent(event,LastSnap);
-    if (!(M_PREFS->getMouseSingleButton() && LastSnap))
+    snapMouseReleaseEvent(event,lastSnap());
+    if (!(M_PREFS->getMouseSingleButton() && lastSnap()))
         Interaction::mouseReleaseEvent(event);
 }
 
@@ -382,8 +388,8 @@ void FeatureSnapInteraction::mouseMoveEvent(QMouseEvent* event)
 //    else
         view()->setCursor(cursor());
 #endif
-    snapMouseMoveEvent(event, LastSnap);
-    if (!(M_PREFS->getMouseSingleButton() && LastSnap))
+    snapMouseMoveEvent(event, lastSnap());
+    if (!(M_PREFS->getMouseSingleButton() && lastSnap()))
         Interaction::mouseMoveEvent(event);
 }
 
@@ -395,8 +401,8 @@ void FeatureSnapInteraction::mouseDoubleClickEvent(QMouseEvent* event)
 #ifndef _MOBILE
         view()->setCursor(cursor());
 #endif
-    snapMouseDoubleClickEvent(event, LastSnap);
-    if (!(M_PREFS->getMouseSingleButton() && LastSnap))
+    snapMouseDoubleClickEvent(event, lastSnap());
+    if (!(M_PREFS->getMouseSingleButton() && lastSnap()))
         Interaction::mouseDoubleClickEvent(event);
 }
 
@@ -443,9 +449,24 @@ void FeatureSnapInteraction::clearSnap()
 
 void FeatureSnapInteraction::clearLastSnap()
 {
-    LastSnap = 0;
+    if (LastSnap) {
+        LastSnap = 0;
+        g_backend.resumeDeletes();
+    }
+}
+
+void FeatureSnapInteraction::setLastSnap(Feature *f)
+{
+    if (!LastSnap) g_backend.delayDeletes();
+    LastSnap = f;
+}
+
+Feature* FeatureSnapInteraction::lastSnap()
+{
+    return LastSnap;
 }
 
+
 QList<Feature*> FeatureSnapInteraction::snapList()
 {
     return StackSnap;
diff --git a/src/Interactions/Interaction.h b/src/Interactions/Interaction.h
index 8c7363d..5b6b12e 100644
--- a/src/Interactions/Interaction.h
+++ b/src/Interactions/Interaction.h
@@ -41,6 +41,7 @@ public:
     virtual void mouseMoveEvent(QMouseEvent* event);
     virtual void mouseDoubleClickEvent(QMouseEvent* event);
     virtual void wheelEvent(QWheelEvent* ev);
+    virtual void mouseEvent(QMouseEvent* ev);
 
     virtual void paintEvent(QPaintEvent* anEvent, QPainter& thePainter);
     virtual QString toHtml() = 0;
@@ -50,16 +51,12 @@ public:
     MainWindow* main();
     bool panning() const;
 
-    virtual void updateSnap(QMouseEvent* event);
-    Feature* lastSnap();
-
 protected:
     MainWindow* theMain;
     bool Panning;
     QPoint FirstPan;
     QPoint LastPan;
 
-    Feature* LastSnap;
     QList<Feature*> NoSnap;
     bool SnapActive;
     bool NoSelectPoints;
@@ -73,7 +70,6 @@ protected:
 
 signals:
     void requestCustomContextMenu(const QPoint & pos);
-    void featureSnap(Feature*);
 
 protected:
     bool Dragging;
@@ -83,6 +79,7 @@ protected:
 
 class FeatureSnapInteraction : public Interaction
 {
+    Q_OBJECT
 public:
     FeatureSnapInteraction(MainWindow* aMain);
 
@@ -98,17 +95,23 @@ public:
     virtual void snapMouseMoveEvent(QMouseEvent* , Feature*);
     virtual void snapMouseDoubleClickEvent(QMouseEvent* , Feature*);
 
+    virtual void mouseEvent(QMouseEvent* event);
+
     void activateSnap(bool b);
     void addToNoSnap(Feature* F);
     void addToNoSnap(QList<Feature *> Fl);
     void clearNoSnap();
     void clearSnap();
-    void clearLastSnap();
     QList<Feature*> snapList();
     void addSnap(Feature* aSnap);
     void setSnap(QList<Feature*> aSnapList);
     void nextSnap();
     void previousSnap();
+    void updateSnap(QMouseEvent* event);
+
+    void setLastSnap(Feature *f);
+    void clearLastSnap();
+    Feature* lastSnap();
 
     void setDontSelectPoints(bool b);
     void setDontSelectRoads(bool b);
@@ -117,13 +120,15 @@ public:
 #ifndef _MOBILE
     virtual QCursor cursor() const;
 #endif
+protected:
+    Feature* LastSnap;
 private:
     QCursor handCursor;
     QCursor grabCursor;
     QCursor defaultCursor;
     QCursor warningCursor;
-
-protected:
+signals:
+    void featureSnap(Feature*);
 };
 
 #endif
diff --git a/src/Interactions/MoveNodeInteraction.cpp b/src/Interactions/MoveNodeInteraction.cpp
index 67c2e43..ef215d7 100644
--- a/src/Interactions/MoveNodeInteraction.cpp
+++ b/src/Interactions/MoveNodeInteraction.cpp
@@ -236,6 +236,7 @@ void MoveNodeInteraction::snapMouseReleaseEvent(QMouseEvent * event, Feature* Cl
 
         if (theList)
             document()->addHistory(theList);
+        theList = NULL;
         view()->setInteracting(false);
         view()->invalidate(true, true, false);
     } else
diff --git a/src/Interactions/RotateInteraction.h b/src/Interactions/RotateInteraction.h
index fad5a02..8f160c4 100644
--- a/src/Interactions/RotateInteraction.h
+++ b/src/Interactions/RotateInteraction.h
@@ -1,5 +1,5 @@
 #ifndef MERKATOR_ROTATEINTERACTION_H_
-#define MERKATOR_ROTATEINTINTERACTION_H_
+#define MERKATOR_ROTATEINTERACTION_H_
 
 #include "Interaction.h"
 #include "Coord.h"
diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp
index e237e84..31966b0 100644
--- a/src/Layers/ImageMapLayer.cpp
+++ b/src/Layers/ImageMapLayer.cpp
@@ -65,8 +65,8 @@ public:
     }
     ~ImageMapLayerPrivate()
     {
-        SAFE_DELETE(theMapAdapter)
-        SAFE_DELETE(theImageManager)
+        delete theMapAdapter;
+        delete theImageManager;
     }
 };
 
@@ -84,7 +84,7 @@ ImageMapLayer::ImageMapLayer(const QString & aName)
 
 ImageMapLayer::~ ImageMapLayer()
 {
-    SAFE_DELETE(p)
+    delete p;
 }
 
 CoordBox ImageMapLayer::boundingBox()
@@ -154,7 +154,7 @@ QString ImageMapLayer::projection() const
     if (p->theMapAdapter)
         return p->theMapAdapter->projection();
 
-    return "";
+    return QString();
 }
 
 IImageManager* ImageMapLayer::getImageManger()
@@ -644,7 +644,6 @@ void ImageMapLayer::draw(MapView& theView, QRect& rect)
 
     if (p->curPix.size() != rect.size()) {
         p->curPix = QPixmap(rect.size());
-        p->curPix.fill(Qt::transparent);
     }
 
     if (p->newPix.isNull())
@@ -671,6 +670,9 @@ void ImageMapLayer::draw(MapView& theView, QRect& rect)
             pms = p->newPix.copy(drawingRect);
     }
 
+    /* We need to clear the pixmap in case we're painting transparent stuff over */
+    p->curPix.fill(Qt::transparent);
+
     QPainter P(&p->curPix);
     P.drawPixmap((pmSize.width()-pms.width())/2, (pmSize.height()-pms.height())/2, pms);
     //    if (p->theMapAdapter->isTiled())
@@ -820,7 +822,7 @@ QRect ImageMapLayer::drawFull(MapView& theView, QRect& rect)
         } else if (p->theMapAdapter->getType() == IMapAdapter::NetworkBackground || p->theMapAdapter->getType() == IMapAdapter::BrowserBackground) {
             QString url (p->theMapAdapter->getQuery(wgs84vp, vp, rect));
             if (!url.isEmpty()) {
-                qDebug() << "ImageMapLayer::drawFull: getting: " << url;
+                //qDebug() << "ImageMapLayer::drawFull: getting: " << url;
                 QPixmap pm = QPixmap::fromImage(p->theMapAdapter->getImageManager()->getImage(p->theMapAdapter,url));
                 if (!pm.isNull()) {
                     p->curPix = QPixmap();
@@ -916,11 +918,11 @@ QRect ImageMapLayer::drawTiled(MapView& theView, QRect& rect)
     QPointF vpCenter0 = QPointF(vpCenter.x()-p->theMapAdapter->getBoundingbox().left(), p->theMapAdapter->getBoundingbox().bottom()-vpCenter.y());
     qreal mapmiddle_tile_x = qRound(vpCenter0.x()/tileWidth);
     qreal mapmiddle_tile_y = qRound(vpCenter0.y()/tileHeight);
-    qDebug() << "z: " << p->theMapAdapter->getAdaptedZoom() << "; t_x: " << mapmiddle_tile_x << "; t_y: " << mapmiddle_tile_y ;
+    //qDebug() << "z: " << p->theMapAdapter->getAdaptedZoom() << "; t_x: " << mapmiddle_tile_x << "; t_y: " << mapmiddle_tile_y ;
 
     qreal cross_x = vpCenter0.x() - mapmiddle_tile_x*tileWidth;		// position on middle tile
     qreal cross_y = vpCenter0.y() - mapmiddle_tile_y*tileHeight;
-    qDebug() << "cross_x: " << cross_x << "; cross_y: " << cross_y;
+    //qDebug() << "cross_x: " << cross_x << "; cross_y: " << cross_y;
 
         // calculate how many surrounding tiles have to be drawn to fill the display
     qreal space_left = vp0Center.x() - cross_x;
@@ -947,8 +949,6 @@ QRect ImageMapLayer::drawTiled(MapView& theView, QRect& rect)
     int cross_scr_y = cross_y * tilesizeH / tileHeight;
 
     QSize pmSize = fRect.size().toSize();
-//    QSize pmSize((tiles_right+tiles_left+1)*tilesizeW, (tiles_bottom+tiles_above+1)*tilesizeH);
-//    QPixmap tmpPm = p->pm.scaled(retRect.size(), Qt::IgnoreAspectRatio);
     p->newPix = QPixmap(pmSize);
     p->newPix.fill(Qt::transparent);
     QPainter painter(&p->newPix);
@@ -977,16 +977,14 @@ QRect ImageMapLayer::drawTiled(MapView& theView, QRect& rect)
     for (QList<Tile>::const_iterator tile = tiles.begin(); tile != tiles.end() && n<100; ++tile)
     {
         QImage pm = p->theMapAdapter->getImageManager()->getImage(p->theMapAdapter, p->theMapAdapter->getQuery(mapmiddle_tile_x+tile->i, mapmiddle_tile_y+tile->j, p->theMapAdapter->getZoom()));
+        int x = (tile->i*tilesizeW)+pmSize.width()/2 -cross_scr_x;
+        int y = (tile->j*tilesizeH)+pmSize.height()/2-cross_scr_y;
         if (!pm.isNull())
-            painter.drawImage((tile->i*tilesizeW)+pmSize.width()/2 -cross_scr_x,
-                               (tile->j*tilesizeH)+pmSize.height()/2-cross_scr_y,
-                               pm);
-
-        if (M_PREFS->getDrawTileBoundary()) {
-            painter.drawRect((tile->i*tilesizeW)+pmSize.width()/2 -cross_scr_x,
-                             (tile->j*tilesizeH)+pmSize.height()/2-cross_scr_y,
-                             tilesizeW, tilesizeH);
-        }
+            painter.drawImage(x, y, pm);
+
+        if (M_PREFS->getDrawTileBoundary())
+            painter.drawRect(x, y, tilesizeW, tilesizeH);
+
         ++n;
     }
     painter.end();
@@ -994,7 +992,7 @@ QRect ImageMapLayer::drawTiled(MapView& theView, QRect& rect)
 //    qDebug() << "tl: " << tl << "; br: " << br;
 //    qDebug() << "vp: " << projVp;
     //    qDebug() << "vlm: " << vlm;
-    qDebug() << "retRect: " << retRect;
+    //qDebug() << "retRect: " << retRect;
 //    QRect expR = QRect(-retRect.left(), -retRect.top(), retRect.width()+retRect.left(), retRect.height()+retRect.top());
 //    p->newPix.save("c:/tmp.png");
 //    p->newPix.copy(expR).save("c:/tmp2.png");
diff --git a/src/Layers/Layer.cpp b/src/Layers/Layer.cpp
index 07d1ed7..53a047b 100644
--- a/src/Layers/Layer.cpp
+++ b/src/Layers/Layer.cpp
@@ -51,7 +51,7 @@ Layer::Layer(const Layer&)
 Layer::~Layer()
 {
     clear();
-    SAFE_DELETE(p);
+    delete p;
 }
 
 void Layer::setName(const QString& s)
@@ -830,9 +830,7 @@ LayerWidget* SpecialLayer::newWidget(void)
 
 void SpecialLayer::refreshLayer()
 {
-    if (m_type == Layer::OsmBugsLayer) {
-        g_Merk_MainWindow->on_layersOpenstreetbugsAction_triggered();
-    } else if (m_type == Layer::MapDustLayer) {
+    if (m_type == Layer::MapDustLayer) {
         g_Merk_MainWindow->on_layersMapdustAction_triggered();
     }
 }
diff --git a/src/Layers/Layer.h b/src/Layers/Layer.h
index b238e86..fe270c2 100644
--- a/src/Layers/Layer.h
+++ b/src/Layers/Layer.h
@@ -48,7 +48,7 @@ public:
         TrackLayerType,
         UploadedLayerType,
         FilterLayerType,
-        OsmBugsLayer,
+        OsmBugsLayer, /* Obsolete */
         MapDustLayer
     } LayerType;
 
@@ -164,7 +164,7 @@ class TrackLayer : public Layer
 {
     Q_OBJECT
 public:
-    TrackLayer(const QString& aName="", const QString& filaname="");
+    TrackLayer(const QString& aName = QString(), const QString& filaname = QString());
     virtual ~TrackLayer();
 
     virtual LayerWidget* newWidget(void);
@@ -190,7 +190,7 @@ class SpecialLayer : public TrackLayer
 {
     Q_OBJECT
 public:
-    SpecialLayer(const QString& aName="", LayerType type=Layer::UndefinedType, const QString& filename="");
+    SpecialLayer(const QString& aName = QString(), LayerType type=Layer::UndefinedType, const QString& filename = QString());
 
     virtual LayerWidget* newWidget(void);
 
diff --git a/src/Layers/OsmRenderLayer.cpp b/src/Layers/OsmRenderLayer.cpp
index bf43f31..2ec78ec 100644
--- a/src/Layers/OsmRenderLayer.cpp
+++ b/src/Layers/OsmRenderLayer.cpp
@@ -17,7 +17,8 @@ inline uint qHash(const QPoint& p)
 
 #define TILE_SIZE 256
 QList<TILE_TYPE> tiles;
-QReadWriteLock tileLock;
+QReadWriteLock tileLock; /* Protects 'tiles' variable */
+QReadWriteLock renderLock; /* Read locks indicate rendering threads, Write lock blocks them */
 #define TILE_CONSTRUCTOR(x, y) QPoint(x, y)
 #define TILE_X(t) t.x()
 #define TILE_Y(t) t.y()
@@ -70,6 +71,7 @@ public:
         if (!p->theDocument)
             return;
 
+        if (!renderLock.tryLockForRead()) return;
         p->theDocument->lockPainters();
 
         TILE_TYPE tile = theTile;
@@ -93,6 +95,7 @@ public:
 
         QMap<RenderPriority, QSet <Feature*> > theFeatures;
 
+        g_backend.delayDeletes();
         for (int i=0; i<p->theDocument->layerSize(); ++i)
             g_backend.getFeatureSet(p->theDocument->getLayer(i), theFeatures, invalidRect, p->theProjection);
 
@@ -105,7 +108,9 @@ public:
         MapRenderer r;
         r.render(&P, theFeatures, projR, /*QRect(0, 0, TILE_SIZE, TILE_SIZE)*/QRect(-((TILE_SIZE*TILE_SURROUND)-TILE_SIZE)/2, -((TILE_SIZE*TILE_SURROUND)-TILE_SIZE)/2, TILE_SIZE*TILE_SURROUND, TILE_SIZE*TILE_SURROUND), p->PixelPerM, p->ROptions);
         P.end();
+        g_backend.resumeDeletes();
         p->theDocument->unlockPainters();
+        renderLock.unlock();
         tileLock.lockForWrite();
         tileCache->insert(tile, img);
 
@@ -153,6 +158,8 @@ void OsmRenderLayer::forceRedraw(const Projection& aProjection, const QTransform
     if (!theDocument)
         return;
 
+    if (!renderLock.tryLockForRead()) return;
+
     setProjection(aProjection);
     setTransform(aTransform);
 
@@ -189,6 +196,8 @@ void OsmRenderLayer::forceRedraw(const Projection& aProjection, const QTransform
         renderGathering = QtConcurrent::map(tiles, RenderTile(this));
         renderGatheringWatcher.setFuture(renderGathering);
     }
+
+    renderLock.unlock();
 }
 
 void OsmRenderLayer::pan(QPoint delta)
@@ -244,3 +253,10 @@ bool OsmRenderLayer::isRenderingDone()
     return renderGathering.isFinished();
 }
 
+void OsmRenderLayer::stopRendering() {
+    renderLock.lockForWrite();
+}
+
+void OsmRenderLayer::resumeRendering() {
+    renderLock.unlock();
+}
diff --git a/src/Layers/OsmRenderLayer.h b/src/Layers/OsmRenderLayer.h
index a252517..e1d1d42 100644
--- a/src/Layers/OsmRenderLayer.h
+++ b/src/Layers/OsmRenderLayer.h
@@ -32,6 +32,9 @@ public:
 
     bool isRenderingDone();
 
+    void stopRendering();
+    void resumeRendering();
+
 signals:
     void renderingDone();
 
diff --git a/src/Main.cpp b/src/Main.cpp
index 975bb61..2193b1a 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -24,59 +24,6 @@
 
 FILE* pLogFile = NULL;
 
-#ifdef QT5
-void myMessageOutput(QtMsgType msgType, const QMessageLogContext &, const QString & str) {
-    const char * buf = str.toStdString().c_str();
-#else
-void myMessageOutput(QtMsgType msgType, const char *buf) {
-#endif
-// From corelib/global/qglobal.cpp : qt_message_output
-
-#if defined(Q_CC_MWERKS) && !defined(Q_OS_SYMBIAN)
-    mac_default_handler(buf);
-#elif defined(Q_OS_WINCE)
-    QString fstr = QString::fromLatin1(buf);
-    fstr += QLatin1String("\n");
-    OutputDebugString(reinterpret_cast<const wchar_t *> (fstr.utf16()));
-#else
-#ifndef NDEBUG
-    fprintf(stderr, "%s\n", buf);
-    fflush(stderr);
-#endif
-    if (pLogFile && msgType == QtDebugMsg) {
-        fprintf(pLogFile, "%s\n", buf);
-        fflush(pLogFile);
-    }
-#endif
-
-    if (msgType == QtFatalMsg
-        || (msgType == QtWarningMsg
-        && (!qgetenv("QT_FATAL_WARNINGS").isNull())) ) {
-
-#if defined(Q_CC_MSVC) && defined(QT_DEBUG) && defined(_DEBUG) && defined(_CRT_ERROR)
-            // get the current report mode
-            int reportMode = _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW);
-            _CrtSetReportMode(_CRT_ERROR, reportMode);
-#if !defined(Q_OS_WINCE)
-            int ret = _CrtDbgReport(_CRT_ERROR, __FILE__, __LINE__, QT_VERSION_STR, buf);
-#else
-            int ret = _CrtDbgReportW(_CRT_ERROR, _CRT_WIDE(__FILE__),
-                __LINE__, _CRT_WIDE(QT_VERSION_STR), reinterpret_cast<const wchar_t *> (QString::fromLatin1(buf).utf16()));
-#endif
-            if (ret == 0  && reportMode & _CRTDBG_MODE_WNDW)
-                return; // ignore
-            else if (ret == 1)
-                _CrtDbgBreak();
-#endif
-
-#if (defined(Q_OS_UNIX) || defined(Q_CC_MINGW))
-            abort(); // trap; generates core dump
-#else
-            exit(1); // goodbye cruel world
-#endif
-    }
-}
-
 void showVersion()
 {
     QString o;
@@ -85,7 +32,7 @@ void showVersion()
     o = QString("using Qt version %1 (built with %2)\n").arg(qVersion()).arg(QT_VERSION_STR);
     fprintf(stdout, "%s", o.toLatin1().data());
     fprintf(stdout, "Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2010\n");
-    fprintf(stdout, "This program is licensed under the Version 2 of the GNU Public License or any later version\n");
+    fprintf(stdout, "This program is licensed under the Version 2 of the GNU General Public License or any later version\n");
 }
 
 void showHelp()
@@ -193,13 +140,9 @@ int main(int argc, char** argv)
 
     if (!logFilename.isNull())
         pLogFile = fopen(logFilename.toLatin1(), "a");
-#ifdef QT5
-    qInstallMessageHandler(myMessageOutput);
-#else
-    qInstallMsgHandler(myMessageOutput);
-#endif
+    /* FIXME: use the file for logging. */
 
-    qDebug() << "**** " << QDateTime::currentDateTime().toString(Qt::ISODate) << " -- Starting " << USER_AGENT;
+    qDebug() << "**** " << QDateTime::currentDateTime().toString(Qt::ISODate) << " -- Starting " << QString("%1 %2").arg(qApp->applicationName()).arg(STRINGIFY(VERSION));
     qDebug() <<	"-------" << QString("using Qt version %1 (built with %2)").arg(qVersion()).arg(QT_VERSION_STR);
     QString projVer = QString(STRINGIFY(PJ_VERSION));
     qDebug() <<	"-------" << QString("using PROJ4 version %1.%2.%3").arg(projVer.left(1)).arg(projVer.mid(1, 1)).arg(projVer.right(1));
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 116bb60..b9ba484 100755
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -132,6 +132,7 @@ class MainWindowPrivate
             title = QString("%1 v%2").arg(STRINGIFY(PRODUCT)).arg(STRINGIFY(REVISION));
         }
 
+        QString FILTER_OPEN_NATIVE;
         QString FILTER_OPEN_SUPPORTED;
         QString FILTER_IMPORT_SUPPORTED;
         int lastPrefTabIndex;
@@ -166,7 +167,6 @@ void SetOptionValue(RendererOptions& options,
 MainWindow::MainWindow(QWidget *parent)
         : QMainWindow(parent)
         , ui(new Ui::MainWindow)
-        , currentProjectFile("")
         , theDocument(0)
         , gpsRecLayer(0)
         , curGpsTrackSegment(0)
@@ -204,6 +204,8 @@ MainWindow::MainWindow(QWidget *parent)
     supported_import_formats_desc += tr("Protobuf Binary Format (*.pbf)\n");
 #endif
 
+    p->FILTER_OPEN_NATIVE = tr("Merkaartor document (*.mdc)\n");
+
     p->FILTER_OPEN_SUPPORTED = QString(tr("Supported formats") + " (*.mdc %1)\n").arg(supported_import_formats);
     p->FILTER_OPEN_SUPPORTED += tr("Merkaartor document (*.mdc)\n") + supported_import_formats_desc;
     p->FILTER_OPEN_SUPPORTED += tr("All Files (*)");
@@ -498,14 +500,16 @@ void MainWindow::handleMessage(const QString &msg)
                 loadUrl(u);
                 continue;
             }
-            fileNames.append(args[i]);
+            if (args[i].endsWith(".mdc", Qt::CaseInsensitive))
+                loadDocument(args[i]);
+            else
+                fileNames.append(args[i]);
         }
     }
 
-    if (fileNames.isEmpty())
-        QDir::setCurrent(M_PREFS->getworkingdir());
-    else
-        loadFiles(fileNames);
+    if (fileNames.size() > 0) {
+        importFiles(theDocument, fileNames, NULL);
+    }
 }
 
 MainWindow::~MainWindow(void)
@@ -772,7 +776,7 @@ bool MainWindow::eventFilter(QObject */* watched */, QEvent *event)
         QMouseEvent* mevent = static_cast<QMouseEvent*>(event);
         updateSegmentMode(mevent);
 
-        theView->interaction()->updateSnap(mevent);
+        theView->interaction()->mouseEvent(mevent);
 
         if (M_PREFS->getSelectModeCreation()) {
             MoveNodeInteraction* MI = NULL;
@@ -781,10 +785,10 @@ bool MainWindow::eventFilter(QObject */* watched */, QEvent *event)
             }
             EditInteraction* EI = dynamic_cast<EditInteraction*>(theView->interaction());
             if ((EI && EI->isIdle()) || (MI && MI->isIdle())) {
-                if ((theView->interaction()->lastSnap() && theView->interaction()->lastSnap()->getType() & IFeature::LineString) || !theView->interaction()->lastSnap())
-                    CreateNodeInteraction::createNode(theView->fromView(mevent->pos()), theView->interaction()->lastSnap());
-                else if (theView->interaction()->lastSnap() && theView->interaction()->lastSnap()->getType() == IFeature::Point) {
-                    Node* N = CAST_NODE(theView->interaction()->lastSnap());
+                if ((EI->lastSnap() && EI->lastSnap()->getType() & IFeature::LineString) || !EI->lastSnap())
+                    CreateNodeInteraction::createNode(theView->fromView(mevent->pos()), EI->lastSnap());
+                else if (EI->lastSnap() && EI->lastSnap()->getType() == IFeature::Point) {
+                    Node* N = CAST_NODE(EI->lastSnap());
                     CreateSingleWayInteraction* CI = new CreateSingleWayInteraction(this, N, false);
                     N->invalidatePainter();
                     launchInteraction(CI);
@@ -811,7 +815,7 @@ bool MainWindow::eventFilter(QObject */* watched */, QEvent *event)
         QMouseEvent* mevent = static_cast<QMouseEvent*>(event);
         updateSegmentMode(mevent);
 
-        theView->interaction()->updateSnap(mevent);
+        theView->interaction()->mouseEvent(mevent);
         if (theInfo)
             theInfo->setHtml(theView->interaction()->toHtml());
 
@@ -828,7 +832,7 @@ bool MainWindow::eventFilter(QObject */* watched */, QEvent *event)
         QMouseEvent* mevent = static_cast<QMouseEvent*>(event);
         updateSegmentMode(mevent);
 
-        theView->interaction()->updateSnap(mevent);
+        theView->interaction()->mouseEvent(mevent);
 
         return false;
     }
@@ -846,7 +850,7 @@ bool MainWindow::eventFilter(QObject */* watched */, QEvent *event)
         QMouseEvent* mevent = static_cast<QMouseEvent*>(event);
         updateSegmentMode(mevent);
 
-        theView->interaction()->updateSnap(mevent);
+        theView->interaction()->mouseEvent(mevent);
 
         if (!M_PREFS->getSeparateMoveMode()) {
             EditInteraction* EI = dynamic_cast<EditInteraction*>(theView->interaction());
@@ -1115,7 +1119,6 @@ void MainWindow::createToolBarManager()
     AddActionsIntoManager(toolBarManager, ui->menuLayers, tr("Layers"));
     AddActionsIntoManager(toolBarManager, ui->menuCreate, tr("Create"));
     AddActionsIntoManager(toolBarManager, ui->menu_Feature, tr("Feature"));
-    AddActionsIntoManager(toolBarManager, ui->menuOpenStreetBugs, tr("OpenStreetBugs"));
     AddActionsIntoManager(toolBarManager, ui->menu_Node, tr("Node"));
     AddActionsIntoManager(toolBarManager, ui->menuRoad, tr("Way"));
     AddActionsIntoManager(toolBarManager, ui->menuRelation, tr("Relation"));
@@ -1123,7 +1126,7 @@ void MainWindow::createToolBarManager()
     AddActionsIntoManager(toolBarManager, ui->menuWindow, tr("Windows"));
     AddActionsIntoManager(toolBarManager, ui->menuHelp, tr("Help"));
 
-    toolBarManager->addToolBar(ui->toolBar, "");
+    toolBarManager->addToolBar(ui->toolBar, QString());
 
     QSettings* Sets = M_PREFS->getQSettings();
     if (!g_Merk_Ignore_Preferences && !g_Merk_Reset_Preferences)
@@ -1156,6 +1159,7 @@ void MainWindow::createProgressDialog()
     theProgressDialog->setLabel(theProgressLabel);
 
     theProgressDialog->setMaximum(11);
+    theProgressDialog->reset();
 }
 
 void MainWindow::deleteProgressDialog()
@@ -1565,20 +1569,12 @@ void MainWindow::on_editReverseAction_triggered()
     emit reverse_triggered();
 }
 
-static void changeCurrentDirToFile(const QString& s)
-{
-    QFileInfo info(s);
-    QDir::setCurrent(info.absolutePath());
-    M_PREFS->setworkingdir(QDir::currentPath());
-}
-
-
 void MainWindow::on_fileImportAction_triggered()
 {
     QStringList fileNames = QFileDialog::getOpenFileNames(
                     this,
                     tr("Import file"),
-                    "", p->FILTER_IMPORT_SUPPORTED);
+                    QString(), p->FILTER_IMPORT_SUPPORTED);
 
     if (fileNames.isEmpty())
         return;
@@ -1630,22 +1626,25 @@ void MainWindow::endBusyCursor() {
 }
 
 MainWindow::ImportStatus MainWindow::importFile(Document * mapDocument, const QString& fileName, Layer*& newLayer) {
+    MainWindow::ImportStatus result;
+
     QString baseFileName = fileName.section('/', - 1);
     if (fileName.toLower().endsWith(".gpx")) {
         QList<TrackLayer*> theTracklayers;
         newLayer = new TrackLayer( baseFileName + " - " + tr("Waypoints"), baseFileName);
         mapDocument->add(newLayer);
         theTracklayers.append((TrackLayer*) newLayer);
-        bool importOK = importGPX(this, baseFileName, mapDocument, theTracklayers);
+        bool importOK = importGPX(this, fileName, mapDocument, theTracklayers);
         if (!importOK) {
             for (int i=0; i<theTracklayers.size(); i++) {
                 mapDocument->remove(theTracklayers[i]);
-                delete theTracklayers[i];
+                SAFE_DELETE(theTracklayers[i]);
             }
+            newLayer = NULL;
         } else {
             if (!newLayer->size()) {
                 mapDocument->remove(newLayer);
-                delete newLayer;
+                SAFE_DELETE(newLayer);
             }
             for (int i=1; i<theTracklayers.size(); i++) {
                 if (theTracklayers[i]->name().isEmpty())
@@ -1655,12 +1654,12 @@ MainWindow::ImportStatus MainWindow::importFile(Document * mapDocument, const QS
                 }
             }
         }
-	return importOK ? IMPORT_OK : IMPORT_ERROR;
+	    result = importOK ? IMPORT_OK : IMPORT_ERROR;
     }
     else if (fileName.toLower().endsWith(".osm")) {
         newLayer = new DrawingLayer( baseFileName );
         mapDocument->add(newLayer);
-        return importOSM(this, baseFileName, mapDocument, newLayer) ? IMPORT_OK : IMPORT_ERROR;
+        result = importOSM(this, fileName, mapDocument, newLayer) ? IMPORT_OK : IMPORT_ERROR;
     }
 #ifndef FRISIUS_BUILD
     else if (fileName.toLower().endsWith(".osc")) {
@@ -1670,28 +1669,28 @@ MainWindow::ImportStatus MainWindow::importFile(Document * mapDocument, const QS
         } else {
             newLayer = mapDocument->getDirtyOrOriginLayer();
         }
-        return mapDocument->importOSC(fileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
+        result = mapDocument->importOSC(fileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
     }
 #endif
     else if (fileName.toLower().endsWith(".ngt")) {
         newLayer = new TrackLayer( baseFileName );
         newLayer->setUploadable(false);
         mapDocument->add(newLayer);
-        bool importOK = importNGT(this, baseFileName, mapDocument, newLayer);
+        bool importOK = importNGT(this, fileName, mapDocument, newLayer);
         if (importOK && M_PREFS->getAutoExtractTracks()) {
             ((TrackLayer *)newLayer)->extractLayer();
         }
-        return importOK ? IMPORT_OK : IMPORT_ERROR;
+        result = importOK ? IMPORT_OK : IMPORT_ERROR;
     }
     else if (fileName.toLower().endsWith(".nmea") || (fileName.toLower().endsWith(".nma"))) {
         newLayer = new TrackLayer( baseFileName );
         newLayer->setUploadable(false);
         mapDocument->add(newLayer);
-        bool importOK = mapDocument->importNMEA(baseFileName, (TrackLayer *)newLayer);
+        bool importOK = mapDocument->importNMEA(fileName, (TrackLayer *)newLayer);
         if (importOK && M_PREFS->getAutoExtractTracks()) {
             ((TrackLayer *)newLayer)->extractLayer();
         }
-        return importOK ? IMPORT_OK : IMPORT_ERROR;
+        result = importOK ? IMPORT_OK : IMPORT_ERROR;
     }
     else if (fileName.toLower().endsWith(".kml")) {
         if (QMessageBox::warning(this, MainWindow::tr("Big Fat Copyright Warning"),
@@ -1714,9 +1713,9 @@ MainWindow::ImportStatus MainWindow::importFile(Document * mapDocument, const QS
             newLayer = new DrawingLayer( baseFileName );
             newLayer->setUploadable(false);
             mapDocument->add(newLayer);
-            return mapDocument->importKML(baseFileName, (TrackLayer *)newLayer) ? IMPORT_OK : IMPORT_ERROR;
+            result = mapDocument->importKML(fileName, (TrackLayer *)newLayer) ? IMPORT_OK : IMPORT_ERROR;
         } else
-            return IMPORT_ABORTED;
+            result = IMPORT_ABORTED;
     }
     else if (fileName.toLower().endsWith(".csv")) {
 #ifndef Q_OS_SYMBIAN
@@ -1725,13 +1724,13 @@ MainWindow::ImportStatus MainWindow::importFile(Document * mapDocument, const QS
         newLayer = new DrawingLayer( baseFileName );
         newLayer->setUploadable(false);
         mapDocument->add(newLayer);
-        return mapDocument->importCSV(baseFileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
+        result = mapDocument->importCSV(fileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
     }
 #ifdef USE_PROTOBUF
     else if (fileName.toLower().endsWith(".pbf")) {
         newLayer = new DrawingLayer( baseFileName );
         mapDocument->add(newLayer);
-        return mapDocument->importPBF(baseFileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
+        result = mapDocument->importPBF(fileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
     }
 #endif
     else { // Fallback to GDAL
@@ -1739,8 +1738,18 @@ MainWindow::ImportStatus MainWindow::importFile(Document * mapDocument, const QS
         newLayer = new DrawingLayer( baseFileName );
         newLayer->setUploadable(false);
         mapDocument->add(newLayer);
-        return mapDocument->importGDAL(baseFileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
+        result = mapDocument->importGDAL(fileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
+        if (result == IMPORT_ERROR) {
+            SAFE_DELETE(newLayer);
+        }
     }
+
+    if (result == IMPORT_ERROR && newLayer) {
+        mapDocument->remove(newLayer);
+        SAFE_DELETE(newLayer);
+    }
+
+    return result;
 }
 
 bool MainWindow::importFiles(Document * mapDocument, const QStringList & fileNames, QStringList * importedFileNames )
@@ -1756,136 +1765,34 @@ bool MainWindow::importFiles(Document * mapDocument, const QStringList & fileNam
     while (it.hasNext())
     {
         const QString & fn = it.next();
-        changeCurrentDirToFile(fn);  // TODO: Whyyyyy?!
 
         Layer* newLayer = NULL;
-	// TODO: The passing mechanism of newLayer is evil black magic.
-	ImportStatus fileImportResult = importFile(mapDocument, fn, newLayer);
-
-	// TODO: Cleaning up after an unsuccessful import should be done
-	// in importFile.
-        if (fileImportResult != IMPORT_OK && newLayer)
-            mapDocument->remove(newLayer);
+        // TODO: The passing mechanism of newLayer is evil black magic.
+        ImportStatus fileImportResult = importFile(mapDocument, fn, newLayer);
 
-	switch (fileImportResult) {
-	    case IMPORT_OK:
+        switch (fileImportResult) {
+            case IMPORT_OK:
                 foundImport = true;
 
                 if (importedFileNames)
                     importedFileNames->append(fn);
 
                 emit content_changed();
-		break;
-	    case IMPORT_ERROR:
-                delete newLayer;
+                break;
+            case IMPORT_ERROR:
                 QMessageBox::warning(this, tr("No valid file"), tr("%1 could not be opened.").arg(fn));
-	    case IMPORT_ABORTED:
-		// noop
-		break;
+            case IMPORT_ABORTED:
+                // noop
+                break;
         }
     }
     endBusyCursor();
     deleteProgressDialog();
+    invalidateView(false);
 
     return foundImport;
 }
 
-void MainWindow::loadFiles(const QStringList & fileList)
-{
-    QStringList fileNames(fileList);
-
-#ifdef GEOIMAGE
-    QStringList images = fileList.filter(".jpg", Qt::CaseInsensitive);
-    if (!images.isEmpty()) {
-        theGeoImage->loadImages(images);
-        QString cur;
-        foreach (cur, images)
-            fileNames.removeAll(cur);
-    }
-#endif
-
-    if (fileNames.isEmpty())
-        return;
-    theLayers->setUpdatesEnabled(false);
-    view()->setUpdatesEnabled(false);
-
-        // Load only the first merkaartor document
-    bool skipImport = false;
-    QMutableStringListIterator it(fileNames);
-    while (it.hasNext())
-    {
-        const QString & fn = it.next();
-
-        if (fn.toLower().endsWith(".mdc") == false)
-            continue;
-
-        if (skipImport == false)
-        {
-            changeCurrentDirToFile(fn);
-            loadDocument(fn);
-            skipImport = true;
-        }
-
-        it.remove();
-    }
-
-    Document* newDoc = theDocument;
-    if (skipImport == false) {
-        newDoc = new Document(theLayers);
-        newDoc->addDefaultLayers();
-    }
-
-    QStringList openedFiles;
-    bool foundImport = importFiles(newDoc, fileNames, &openedFiles);
-
-    foreach (QString currentFileName, openedFiles)
-        M_PREFS->addRecentOpen(currentFileName);
-
-    updateRecentOpenMenu();
-
-    p->theProperties->setSelection(0);
-
-    if (skipImport == false)
-    {
-        if (foundImport)
-        {
-            // only imported some tracks
-            p->theFeats->invalidate();
-            delete theDocument;
-            theDocument = newDoc;
-            connect (theDocument, SIGNAL(historyChanged()), theDirty, SLOT(updateList()));
-            connect (theDocument, SIGNAL(historyChanged()), this, SIGNAL(content_changed()));
-            connect(theDocument, SIGNAL(imageRequested(ImageMapLayer*)),
-                    this, SLOT(onImagerequested(ImageMapLayer*)), Qt::QueuedConnection);
-            connect(theDocument, SIGNAL(imageReceived(ImageMapLayer*)),
-                    this, SLOT(onImagereceived(ImageMapLayer*)), Qt::QueuedConnection);
-            connect(theDocument, SIGNAL(loadingFinished(ImageMapLayer*)),
-                    this, SLOT(onLoadingfinished(ImageMapLayer*)), Qt::QueuedConnection);
-
-            theDirty->updateList();
-            theView->setDocument(theDocument);
-            on_viewZoomAllAction_triggered();
-        }
-        else
-        {
-            // we didn't really open anything successfully
-            delete newDoc;
-        }
-    } else {
-        if (foundImport) {
-            on_viewZoomAllAction_triggered();
-        }
-    }
-
-    on_editPropertiesAction_triggered();
-    theDocument->history().setActions(ui->editUndoAction, ui->editRedoAction, ui->fileUploadAction);
-
-    theLayers->setUpdatesEnabled(true);
-    view()->setUpdatesEnabled(true);
-
-    invalidateView(false);
-}
-
 void MainWindow::loadUrl(const QUrl& theUrl)
 {
     activateWindow();
@@ -1932,6 +1839,47 @@ void MainWindow::loadUrl(const QUrl& theUrl)
         properties()->setSelection(0);
         properties()->addSelection(F);
         emit content_changed();
+    } else if (theUrl.path() == "/add_node") {
+        qreal lat = theQuery.queryItemValue("lat").toDouble();
+        qreal lon = theQuery.queryItemValue("lon").toDouble();
+	QString addtagsstring=theQuery.queryItemValue("addtags");
+	Coord pos=Coord(lon,lat);
+	Node* N;
+	CommandList* theList;
+	Layer* l=document()->getDirtyOrOriginLayer();
+        N = g_backend.allocNode(g_Merk_MainWindow->document()->getDirtyOrOriginLayer(), pos);
+	N->setDirtyLevel(1);
+	QString poiName=".";
+	if (addtagsstring.size()>0) {
+	  QStringList addtags = QUrl::fromPercentEncoding(addtagsstring.toUtf8()).split("|");
+	  foreach (const QString &tag, addtags) {
+	    QStringList kv = tag.split("=");
+	    QString k=kv[0];
+	    QString v;
+	    if (kv.size()>0) {
+	      v=kv[1];
+	      if (k=="name") poiName=v;
+	    }
+	    N->setTag(k,v);
+	  }
+	}
+	theList  = new CommandList(MainWindow::tr("Remote add POI %1 %2").arg(N->id().numId).arg(poiName), N);
+	theList->add(new AddFeatureCommand(l,N,true));
+	g_Merk_MainWindow->properties()->setSelection(0);
+	N->updateMeta();		
+	document()->addHistory(theList);
+        properties()->setSelection(0);
+	properties()->addSelection(N);
+	theView->invalidate(true, true, false);
+	CoordBox cb;
+	cb = N->boundingBox();
+	if (!cb.isNull()) {
+	  CoordBox mini(cb.center()-COORD_ENLARGE, cb.center()+COORD_ENLARGE);
+	  cb.merge(mini);
+	  cb = cb.zoomed(1.1);
+	  theView->setViewport(cb, theView->rect());
+	}
+        emit content_changed();
     } else if (theUrl.path() == "/load_and_zoom") {
         qreal t = theQuery.queryItemValue("top").toDouble();
         qreal b = theQuery.queryItemValue("bottom").toDouble();
@@ -1970,7 +1918,7 @@ void MainWindow::loadUrl(const QUrl& theUrl)
             }
         }
     } else {
-        QMessageBox::critical(this, tr("Incoming Remote control request"), tr("Unknow action url: %1").arg(theUrl.toString()));
+        QMessageBox::critical(this, tr("Incoming Remote control request"), tr("Unknown action url: %1").arg(theUrl.toString()));
     }
 #undef theQuery
 }
@@ -1980,12 +1928,10 @@ void MainWindow::on_fileOpenAction_triggered()
     if (hasUnsavedChanges() && !mayDiscardUnsavedChanges(this))
         return;
 
-    QStringList fileNames = QFileDialog::getOpenFileNames(
-                    this,
-                    tr("Open files"),
-                    "", p->FILTER_OPEN_SUPPORTED);
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open file"), QString(), p->FILTER_OPEN_NATIVE );
 
-    loadFiles(fileNames);
+    if (!fileName.isNull())
+        loadDocument(fileName);
 }
 
 void MainWindow::on_fileUploadAction_triggered()
@@ -2051,28 +1997,6 @@ void MainWindow::on_fileDownloadMoreAction_triggered()
     emit content_changed();
 }
 
-void MainWindow::on_layersOpenstreetbugsAction_triggered()
-{
-    SpecialLayer* sl = NULL;
-    for (int i=0; i<theDocument->layerSize(); ++i) {
-        if (theDocument->getLayer(i)->classType() == Layer::OsmBugsLayer) {
-            sl = dynamic_cast<SpecialLayer*>(theDocument->getLayer(i));
-            while (sl->size())
-            {
-                sl->deleteFeature(sl->get(0));
-            }
-        }
-    }
-
-    createProgressDialog();
-
-    if (!::downloadOpenstreetbugs(this, theView->viewport(), theDocument, sl)) {
-        QMessageBox::warning(this, tr("Error downloading OpenStreetBugs"), tr("The OpenStreetBugs could not be downloaded"));
-    }
-
-    deleteProgressDialog();
-}
-
 void MainWindow::on_layersMapdustAction_triggered()
 {
     SpecialLayer* sl = NULL;
@@ -2384,7 +2308,7 @@ void MainWindow::on_fileNewAction_triggered()
                 this, SLOT(onLoadingfinished(ImageMapLayer*)), Qt::QueuedConnection);
         theDirty->updateList();
 
-        currentProjectFile = "";
+        currentProjectFile.clear();
         setWindowTitle(QString("%1 - %2").arg(theDocument->title()).arg(p->title));
 
         updateProjectionMenu();
@@ -2608,41 +2532,6 @@ void MainWindow::on_featureCommitAction_triggered()
     }
 }
 
-void MainWindow::on_featureOsbClose_triggered()
-{
-    Feature* bugNd = p->theProperties->selection(0);
-
-    QUrl osbUrl;
-    osbUrl.setUrl(M_PREFS->getOpenStreetBugsUrl());
-    osbUrl.setPath(osbUrl.path() + "closePOIexec");
-#ifdef QT5
-    QUrlQuery theQuery(osbUrl);
-    theQuery.addQueryItem("id", Feature::stripToOSMId(bugNd->id()));
-    osbUrl.setQuery(theQuery);
-#else
-    osbUrl.addQueryItem("id", Feature::stripToOSMId(bugNd->id()));
-#endif
-    qDebug() << osbUrl.toString();
-
-    QString rply;
-    bool ret = Utils::sendBlockingNetRequest(osbUrl, rply);
-
-    if (!ret) {
-        QMessageBox::warning(0, tr("Network timeout"), tr("Cannot contact OpenStreetBugs."), QMessageBox::Ok);
-        return;
-    }
-
-    qDebug() << "openStreetBugs reply: " << rply;
-    if (rply.contains("ok")) {
-        bugNd->layer()->deleteFeature(bugNd);
-        p->theProperties->setSelection(0);
-        invalidateView();
-    } else
-        QMessageBox::warning(this, tr("Error closing bug"), tr("Cannot delete bug. Server message is:\n%1").arg(rply), QMessageBox::Ok);
-
-    return;
-}
-
 void MainWindow::on_roadCreateJunctionAction_triggered()
 {
     CommandList* theList = new CommandList(MainWindow::tr("Create Junction"), NULL);
@@ -2929,7 +2818,7 @@ void MainWindow::on_createRelationAction_triggered()
     theList->add(
         new AddFeatureCommand(document()->getDirtyOrOriginLayer(), R, true));
     for (int i = 0; i < p->theProperties->selectionSize(); ++i)
-        theList->add(new RelationAddFeatureCommand(R, "", p->theProperties->selection(i)));
+        theList->add(new RelationAddFeatureCommand(R, QString(), p->theProperties->selection(i)));
     theDocument->addHistory(theList);
     p->theProperties->setSelection(R);
     invalidateView();
@@ -3114,7 +3003,6 @@ void MainWindow::on_toolsShortcutsAction_triggered()
     CollectActions(theActions, ui->menuLayers);
     CollectActions(theActions, ui->menuCreate);
     CollectActions(theActions, ui->menu_Feature);
-    CollectActions(theActions, ui->menuOpenStreetBugs);
     CollectActions(theActions, ui->menu_Node);
     CollectActions(theActions, ui->menuRoad);
     CollectActions(theActions, ui->menuRelation);
@@ -3139,7 +3027,7 @@ void MainWindow::toolsPreferencesAction_triggered(bool focusData)
 
 void MainWindow::preferencesChanged(PreferencesDialog* prefs)
 {
-    QString qVer = QString(qVersion()).replace(".", "");
+    QString qVer = QString(qVersion()).replace('.', QChar());
     int iQVer = qVer.toInt();
     if (iQVer < 451) {
         QApplication::setStyle(QStyleFactory::create("skulpture"));
@@ -3220,7 +3108,7 @@ void MainWindow::on_fileSaveAsTemplateAction_triggered()
 
 void MainWindow::on_fileSaveAction_triggered()
 {
-    if (currentProjectFile != "") {
+    if (!currentProjectFile.isEmpty()) {
         saveDocument(currentProjectFile);
     } else {
         on_fileSaveAsAction_triggered();
@@ -3344,6 +3232,7 @@ void MainWindow::loadDocument(QString fn)
     file.close();
 
     if (newDoc) {
+        theView->stopRendering();
         p->theProperties->setSelection(0);
         p->theFeats->invalidate();
         delete theDocument;
@@ -3363,6 +3252,7 @@ void MainWindow::loadDocument(QString fn)
         currentProjectFile = fn;
         setWindowTitle(QString("%1 - %2").arg(theDocument->title()).arg(p->title));
         p->latSaveDirtyLevel = theDocument->getDirtySize();
+        theView->resumeRendering();
     }
 
     M_PREFS->addRecentOpen(fn);
@@ -3894,8 +3784,8 @@ void MainWindow::recentOpenTriggered(QAction* anAction)
     if (hasUnsavedChanges() && !mayDiscardUnsavedChanges(this))
         return;
 
-    QStringList fileNames(anAction->text());
-    loadFiles(fileNames);
+    QString fileName(anAction->text());
+    loadDocument(fileName);
 }
 
 void MainWindow::recentImportTriggered(QAction* anAction)
@@ -4223,9 +4113,6 @@ void MainWindow::on_toolTemplatesLoadAction_triggered()
     p->theProperties->resetValues();
 }
 
-QString MainWindow::translationsPath() {
-    return QCoreApplication::applicationDirPath() + "/translations";
-}
 
 #if defined(Q_OS_MAC)
 QString MainWindow::macOsTranslationsPath() {
@@ -4236,48 +4123,41 @@ QString MainWindow::macOsTranslationsPath() {
 }
 #endif
 
-bool MainWindow::tryLoadQtTranslator(const QString& languagePrefix)
-{
-    if (g_Merk_Portable) {
-        return qtTranslator->load("qt_" + languagePrefix, translationsPath());
-    } else {
-#ifdef TRANSDIR_SYSTEM
-        if (!QDir::isAbsolutePath(STRINGIFY(TRANSDIR_SYSTEM)))
-            return qtTranslator->load("qt_" + languagePrefix, QCoreApplication::applicationDirPath() + "/" + STRINGIFY(TRANSDIR_SYSTEM));
-        else
-            return qtTranslator->load("qt_" + languagePrefix, STRINGIFY(TRANSDIR_SYSTEM));
-#else
-#if defined(Q_OS_MAC)
-        return qtTranslator->load("qt_" + languagePrefix, macOsTranslationsPath());
-#else
-        return qtTranslator->load("qt_" + languagePrefix, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-#endif // Q_OS_MAC
-#endif // TRANSDIR_SYSTEM
-    }
+QString MainWindow::makeAbsolute(const QString& path) {
+    if (QDir::isAbsolutePath(path))
+        return path;
+    else
+        return QCoreApplication::applicationDirPath() + "/" + path;
 }
 
-bool MainWindow::tryLoadMerkaartorTranslator(const QString& language)
-{
-    if (g_Merk_Portable) {
-        return merkaartorTranslator->load("merkaartor_" + language, translationsPath());
-    } else {
-	bool success;
+/* Compose the list of translation paths. */
+QStringList MainWindow::translationPaths() {
+    QStringList paths;
+    /* Try the macros first, as they are defined by the user. */
+    paths << makeAbsolute(STRINGIFY(TRANSDIR_SYSTEM));
+    paths << makeAbsolute(STRINGIFY(TRANSDIR_MERKAARTOR));
+    paths << QCoreApplication::applicationDirPath();
+    paths << QCoreApplication::applicationDirPath() + "/translations";
 #if defined(Q_OS_MAC)
-        success = merkaartorTranslator->load("merkaartor_" + language, macOsTranslationsPath());
-#else
-        success = merkaartorTranslator->load("merkaartor_" + language, QCoreApplication::applicationDirPath());
+    paths << macOsTranslationsPath();
 #endif
-#ifdef TRANSDIR_MERKAARTOR
-        if (!success) {
-            // Next, try the TRANSDIR_MERKAARTOR, if defined
-            if (!QDir::isAbsolutePath(STRINGIFY(TRANSDIR_MERKAARTOR)))
-                return merkaartorTranslator->load("merkaartor_" + language, QCoreApplication::applicationDirPath() + "/" + STRINGIFY(TRANSDIR_MERKAARTOR));
-            else
-                return merkaartorTranslator->load("merkaartor_" + language, STRINGIFY(TRANSDIR_MERKAARTOR));
+    paths << QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+    return paths;
+}
+
+bool MainWindow::tryLoadTranslator(const QString& languageFile, QTranslator* theTranslator)
+{
+    qDebug() << "Looking for translations file: " << languageFile;
+    QStringList paths = translationPaths();
+    foreach (const QString &path, paths) {
+        qDebug() << "  Trying directory " << path;
+        if (theTranslator->load(languageFile, path)) {
+            qDebug() << "  Found it.";
+            return true;
         }
-#endif
-	return success;
     }
+    qDebug() << "  Not found.";
+    return false;
 }
 
 void MainWindow::updateLanguage()
@@ -4292,12 +4172,12 @@ void MainWindow::updateLanguage()
     if (language != "-" && language != "en") {
         qtTranslator = new QTranslator;
         const QString languagePrefix = language.left(2);
-        if (tryLoadQtTranslator(languagePrefix))
+        if (tryLoadTranslator("qt_"+languagePrefix, qtTranslator))
             QCoreApplication::installTranslator(qtTranslator);
 
         // Do not prevent Merkaartor translations to be loaded, even if there is no Qt translation for the language.
         merkaartorTranslator = new QTranslator;
-        if (tryLoadMerkaartorTranslator(language))
+        if (tryLoadTranslator("merkaartor_"+language, merkaartorTranslator))
             QCoreApplication::installTranslator(merkaartorTranslator);
         else
             statusBar()->showMessage(tr("Warning! Could not load the Merkaartor translations for the \"%1\" language. Switching to default English.").arg(language), 15000);
diff --git a/src/MainWindow.h b/src/MainWindow.h
index c7200c4..7399211 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -77,7 +77,6 @@ public slots:
     virtual void on_layersNewImageAction_triggered();
     virtual void on_layersNewDrawingAction_triggered();
     virtual void on_layersNewFilterAction_triggered();
-    virtual void on_layersOpenstreetbugsAction_triggered();
     virtual void on_layersMapdustAction_triggered();
 
     virtual void on_fileNewAction_triggered();
@@ -139,7 +138,6 @@ public slots:
     virtual void on_featureDownloadMissingChildrenAction_triggered();
     virtual void on_featureDeleteAction_triggered();
     virtual void on_featureCommitAction_triggered();
-    virtual void on_featureOsbClose_triggered();
 
     virtual void on_nodeAlignAction_triggered();
     virtual void on_nodeSpreadAction_triggered();
@@ -259,7 +257,6 @@ public slots:
 
 public:
     bool importFiles(Document * mapDocument, const QStringList & filesNames, QStringList * importedFileNames = NULL);
-    void loadFiles(const QStringList & fileNames);
     void loadUrl(const QUrl& u);
     void loadDocument(QString fn);
     void loadTemplateDocument(QString fn);
@@ -322,13 +319,13 @@ private:
     Document* doLoadDocument(QFile* file);
     void doSaveDocument(QFile* fn, bool asTemplate=false);
 
-    QString translationsPath();
+    QString makeAbsolute(const QString& path);
+    QStringList translationPaths();
 #if defined(Q_OS_MAC)
     QString macOsTranslationsPath();
 #endif
 
-    bool tryLoadQtTranslator(const QString& languagePrefix);
-    bool tryLoadMerkaartorTranslator(const QString& defaultLanguage);
+    bool tryLoadTranslator(const QString& languageFile, QTranslator* theTranslator);
 
     void dieClipboardInvalid();
     void warnMapDownloadFailed();
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 32e97ea..66ec72a 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -245,12 +245,6 @@
     <property name="title">
      <string>Fea&ture</string>
     </property>
-    <widget class="QMenu" name="menuOpenStreetBugs">
-     <property name="title">
-      <string>OpenStreetBugs</string>
-     </property>
-     <addaction name="featureOsbClose"/>
-    </widget>
     <addaction name="featureSelectChildrenAction"/>
     <addaction name="featureSelectParentsAction"/>
     <addaction name="separator"/>
@@ -258,8 +252,6 @@
     <addaction name="featureCommitAction"/>
     <addaction name="separator"/>
     <addaction name="featureDownloadMissingChildrenAction"/>
-    <addaction name="separator"/>
-    <addaction name="menuOpenStreetBugs"/>
    </widget>
    <widget class="QMenu" name="menuLayers">
     <property name="title">
@@ -268,7 +260,6 @@
     <addaction name="layersNewImageAction"/>
     <addaction name="layersNewDrawingAction"/>
     <addaction name="layersNewFilterAction"/>
-    <addaction name="layersOpenstreetbugsAction"/>
     <addaction name="layersMapdustAction"/>
     <addaction name="separator"/>
    </widget>
@@ -395,6 +386,9 @@
    <property name="text">
     <string>&Quit</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
    <property name="menuRole">
     <enum>QAction::QuitRole</enum>
    </property>
@@ -403,6 +397,9 @@
    <property name="text">
     <string>&About</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
    <property name="menuRole">
     <enum>QAction::AboutRole</enum>
    </property>
@@ -419,7 +416,7 @@
     <string>Create a new document and import a file</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+O</string>
+    <string notr="true">Ctrl+O</string>
    </property>
   </action>
   <action name="viewZoomAllAction">
@@ -431,7 +428,7 @@
     <string>Zoom &all</string>
    </property>
    <property name="shortcut">
-    <string>F2</string>
+    <string notr="true">F2</string>
    </property>
   </action>
   <action name="viewZoomWindowAction">
@@ -445,7 +442,7 @@
     <string>Zoom window</string>
    </property>
    <property name="shortcut">
-    <string>F3</string>
+    <string notr="true">F3</string>
    </property>
   </action>
   <action name="viewZoomOutAction">
@@ -457,7 +454,7 @@
     <string>Zoom &out</string>
    </property>
    <property name="shortcut">
-    <string>-</string>
+    <string notr="true">-</string>
    </property>
   </action>
   <action name="viewZoomInAction">
@@ -475,7 +472,7 @@
     <string>Zoom in</string>
    </property>
    <property name="shortcut">
-    <string>+</string>
+    <string notr="true">+</string>
    </property>
   </action>
   <action name="createWayAction">
@@ -501,7 +498,7 @@
     <string>&Undo</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Z</string>
+    <string notr="true">Ctrl+Z</string>
    </property>
   </action>
   <action name="editRedoAction">
@@ -513,7 +510,7 @@
     <string>&Redo</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Y</string>
+    <string notr="true">Ctrl+Y</string>
    </property>
   </action>
   <action name="editMoveAction">
@@ -528,7 +525,7 @@
     <string>&Move</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+M</string>
+    <string notr="true">Ctrl+M</string>
    </property>
   </action>
   <action name="fileImportAction">
@@ -542,6 +539,9 @@
    <property name="statusTip">
     <string>Import a file into the current document</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="fileDownloadAction">
    <property name="icon">
@@ -555,7 +555,7 @@
     <string>Download map data for a new area</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+D</string>
+    <string notr="true">Ctrl+D</string>
    </property>
   </action>
   <action name="createLinearWayAction">
@@ -584,7 +584,7 @@
     <string>&Select</string>
    </property>
    <property name="shortcut">
-    <string>Esc</string>
+    <string notr="true">Esc</string>
    </property>
   </action>
   <action name="fileUploadAction">
@@ -599,7 +599,7 @@
     <string>Upload changes to the server</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+U</string>
+    <string notr="true">Ctrl+U</string>
    </property>
   </action>
   <action name="editRemoveAction">
@@ -617,7 +617,7 @@
     <string>Remove selected features</string>
    </property>
    <property name="shortcut">
-    <string>Del</string>
+    <string notr="true">Del</string>
    </property>
   </action>
   <action name="createRoadAction">
@@ -635,7 +635,7 @@
     <string>Create new road</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+R</string>
+    <string notr="true">Ctrl+R</string>
    </property>
   </action>
   <action name="createNodeAction">
@@ -653,7 +653,7 @@
     <string>Create new node</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+N</string>
+    <string notr="true">Ctrl+N</string>
    </property>
   </action>
   <action name="editReverseAction">
@@ -670,6 +670,9 @@
    <property name="toolTip">
     <string>Reverse road direction</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewGotoAction">
    <property name="icon">
@@ -680,7 +683,7 @@
     <string>&Go To...</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+G</string>
+    <string notr="true">Ctrl+G</string>
    </property>
   </action>
   <action name="createDoubleWayAction">
@@ -690,6 +693,9 @@
    <property name="toolTip">
     <string>Create Double carriage way</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="createRoundaboutAction">
    <property name="text">
@@ -698,6 +704,9 @@
    <property name="toolTip">
     <string>Create Roundabout</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
    <property name="menuRole">
     <enum>QAction::NoRole</enum>
    </property>
@@ -713,6 +722,9 @@
    <property name="statusTip">
     <string>Create a new document</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="roadSplitAction">
    <property name="icon">
@@ -726,7 +738,7 @@
     <string>Split road into separate (connected) roads</string>
    </property>
    <property name="shortcut">
-    <string>Alt+S</string>
+    <string notr="true">Alt+S</string>
    </property>
   </action>
   <action name="roadJoinAction">
@@ -741,7 +753,7 @@
     <string>Join connected roads to a single road</string>
    </property>
    <property name="shortcut">
-    <string>Alt+J</string>
+    <string notr="true">Alt+J</string>
    </property>
   </action>
   <action name="roadBreakAction">
@@ -759,7 +771,7 @@
     <string>Break apart connected roads</string>
    </property>
    <property name="shortcut">
-    <string>Alt+B</string>
+    <string notr="true">Alt+B</string>
    </property>
   </action>
   <action name="createRelationAction">
@@ -769,6 +781,9 @@
    <property name="toolTip">
     <string>Create Relation</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="createAreaAction">
    <property name="checkable">
@@ -784,21 +799,33 @@
    <property name="toolTip">
     <string>Create new area</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="editMapStyleAction">
    <property name="text">
     <string>&Edit...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="mapStyleSaveAsAction">
    <property name="text">
     <string>Save &As...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="mapStyleLoadAction">
    <property name="text">
     <string>&Load...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="createCurvedRoadAction">
    <property name="text">
@@ -813,6 +840,9 @@
    <property name="text">
     <string>&Preferences...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
    <property name="menuRole">
     <enum>QAction::PreferencesRole</enum>
    </property>
@@ -847,6 +877,9 @@
    <property name="statusTip">
     <string>Find and select items</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="exportOSMViewportAction">
    <property name="text">
@@ -868,11 +901,17 @@
    <property name="text">
     <string>&Add...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="bookmarkRemoveAction">
    <property name="text">
     <string>&Remove...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="nodeMergeAction">
    <property name="text">
@@ -885,13 +924,16 @@
     <string>Merge the selected nodes (first selected will remain)</string>
    </property>
    <property name="shortcut">
-    <string>Alt+M</string>
+    <string notr="true">Alt+M</string>
    </property>
   </action>
   <action name="fileSaveAsAction">
    <property name="text">
     <string>Save &As...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="fileSaveAction">
    <property name="icon">
@@ -905,7 +947,7 @@
     <string>Save to file</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+S</string>
+    <string notr="true">Ctrl+S</string>
    </property>
   </action>
   <action name="fileDownloadMoreAction">
@@ -926,7 +968,7 @@
     <string>Download the current view to the previous download layer</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Shift+D</string>
+    <string notr="true">Ctrl+Shift+D</string>
    </property>
   </action>
   <action name="action_Docks">
@@ -948,7 +990,7 @@
     <string>Hide/Show the Properties dock</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+P</string>
+    <string notr="true">Ctrl+P</string>
    </property>
   </action>
   <action name="windowLayersAction">
@@ -965,7 +1007,7 @@
     <string>Hide/Show the Layers dock</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+L</string>
+    <string notr="true">Ctrl+L</string>
    </property>
   </action>
   <action name="windowInfoAction">
@@ -982,7 +1024,7 @@
     <string>Hide/Show the Info dock</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+I</string>
+    <string notr="true">Ctrl+I</string>
    </property>
   </action>
   <action name="nodeAlignAction">
@@ -1000,7 +1042,7 @@
     <string>Align selected nodes. First two selected give the line.</string>
    </property>
    <property name="shortcut">
-    <string>Alt+A</string>
+    <string notr="true">Alt+A</string>
    </property>
   </action>
   <action name="nodeSpreadAction">
@@ -1017,6 +1059,9 @@
    <property name="statusTip">
     <string>Align and spread selected nodes equally.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="windowDirtyAction">
    <property name="checkable">
@@ -1032,7 +1077,7 @@
     <string>Hide/Show the Undo dock</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+T</string>
+    <string notr="true">Ctrl+T</string>
    </property>
   </action>
   <action name="viewDownloadedAction">
@@ -1043,7 +1088,7 @@
     <string>Show &downloaded areas</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+A</string>
+    <string notr="true">Ctrl+Alt+A</string>
    </property>
   </action>
   <action name="editCopyAction">
@@ -1061,7 +1106,7 @@
     <string>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+C</string>
+    <string notr="true">Ctrl+C</string>
    </property>
   </action>
   <action name="editPasteOverwriteAction">
@@ -1072,7 +1117,7 @@
     <string>Paste (and overwrite) the tags in the clipboard to the selected feature.</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+V, O</string>
+    <string notr="true">Ctrl+V, O</string>
    </property>
   </action>
   <action name="editPasteMergeAction">
@@ -1093,7 +1138,7 @@
     <string>Merge the tags in the clipboard with the ones of the selected feature.</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+V, M</string>
+    <string notr="true">Ctrl+V, M</string>
    </property>
   </action>
   <action name="exportOSMSelectedAction">
@@ -1124,13 +1169,16 @@
     <string>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+V, F</string>
+    <string notr="true">Ctrl+V, F</string>
    </property>
   </action>
   <action name="exportOSMAction">
    <property name="text">
     <string>OSM (XML)</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="exportOSMBinAction">
    <property name="text">
@@ -1150,16 +1198,25 @@
    <property name="whatsThis">
     <string>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="exportGPXAction">
    <property name="text">
     <string>GPX</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="exportKMLAction">
    <property name="text">
     <string>KML</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="windowToolbarAction">
    <property name="text">
@@ -1171,13 +1228,16 @@
    <property name="statusTip">
     <string>Hide/Show the Toolbar</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="windowHideAllAction">
    <property name="text">
     <string>Hide All</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+F</string>
+    <string notr="true">Ctrl+F</string>
    </property>
   </action>
   <action name="windowShowAllAction">
@@ -1185,7 +1245,7 @@
     <string>Show All</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+F</string>
+    <string notr="true">Ctrl+F</string>
    </property>
    <property name="visible">
     <bool>false</bool>
@@ -1209,7 +1269,7 @@
     <string>Show &nodes</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+P</string>
+    <string notr="true">Ctrl+Alt+P</string>
    </property>
   </action>
   <action name="viewNamesAction">
@@ -1220,7 +1280,7 @@
     <string>Show na&mes</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+N</string>
+    <string notr="true">Ctrl+Alt+N</string>
    </property>
   </action>
   <action name="gpsConnectAction">
@@ -1230,6 +1290,9 @@
    <property name="toolTip">
     <string>Start GPS</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="gpsReplayAction">
    <property name="text">
@@ -1238,6 +1301,9 @@
    <property name="toolTip">
     <string>Replay GPS</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="windowGPSAction">
    <property name="checkable">
@@ -1253,7 +1319,7 @@
     <string>Hide/Show the GPS dock</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+W</string>
+    <string notr="true">Ctrl+W</string>
    </property>
   </action>
   <action name="gpsDisconnectAction">
@@ -1266,6 +1332,9 @@
    <property name="toolTip">
     <string>Stop GPS</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="gpsCenterAction">
    <property name="checkable">
@@ -1274,6 +1343,9 @@
    <property name="text">
     <string>&Center on GPS</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewTrackSegmentsAction">
    <property name="checkable">
@@ -1283,7 +1355,7 @@
     <string>Show track &segments</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+T</string>
+    <string notr="true">Ctrl+Alt+T</string>
    </property>
   </action>
   <action name="viewScaleAction">
@@ -1294,7 +1366,7 @@
     <string>Show &scale</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+S</string>
+    <string notr="true">Ctrl+Alt+S</string>
    </property>
   </action>
   <action name="viewRelationsAction">
@@ -1305,7 +1377,7 @@
     <string>Show &relations</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+R</string>
+    <string notr="true">Ctrl+Alt+R</string>
    </property>
   </action>
   <action name="viewStyleForegroundAction">
@@ -1315,6 +1387,9 @@
    <property name="text">
     <string>Show roads background</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewStyleBackgroundAction">
    <property name="checkable">
@@ -1323,6 +1398,9 @@
    <property name="text">
     <string>Show roads boundary</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewStyleTouchupAction">
    <property name="checkable">
@@ -1331,6 +1409,9 @@
    <property name="text">
     <string>Show touchup</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="gpsRecordAction">
    <property name="checkable">
@@ -1348,6 +1429,9 @@
    <property name="toolTip">
     <string>Record GPS</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="gpsPauseAction">
    <property name="checkable">
@@ -1362,6 +1446,9 @@
    <property name="toolTip">
     <string>Pause GPS</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="windowGeoimageAction">
    <property name="checkable">
@@ -1377,13 +1464,16 @@
     <string>Hide/Show the GeoImage dock</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+E</string>
+    <string notr="true">Ctrl+E</string>
    </property>
   </action>
   <action name="toolsWorldOsbAction">
    <property name="text">
     <string>World OSB manager...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
    <property name="visible">
     <bool>false</bool>
    </property>
@@ -1392,31 +1482,49 @@
    <property name="text">
     <string>&Shortcut Editor...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolTemplatesLoadAction">
    <property name="text">
     <string>&Load...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolTemplatesMergeAction">
    <property name="text">
     <string>&Merge...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolTemplatesSaveAction">
    <property name="text">
     <string>&Save...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="relationAddMemberAction">
    <property name="text">
     <string>&Add member</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="relationRemoveMemberAction">
    <property name="text">
     <string>&Remove member</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewArrowsNeverAction">
    <property name="checkable">
@@ -1425,6 +1533,9 @@
    <property name="text">
     <string>&Never</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewArrowsOnewayAction">
    <property name="checkable">
@@ -1433,6 +1544,9 @@
    <property name="text">
     <string>for &Oneway roads</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewArrowsAlwaysAction">
    <property name="checkable">
@@ -1441,6 +1555,9 @@
    <property name="text">
     <string>&Always</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="nodeDetachAction">
    <property name="icon">
@@ -1456,6 +1573,9 @@
    <property name="statusTip">
     <string>Detach a node from a Road</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="fileWorkOfflineAction">
    <property name="checkable">
@@ -1468,6 +1588,9 @@
    <property name="text">
     <string>&Work Offline</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="renderSVGAction">
    <property name="text">
@@ -1488,23 +1611,32 @@
     <string>Hide/Show the Styles dock</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+B</string>
+    <string notr="true">Ctrl+B</string>
    </property>
   </action>
   <action name="toolsWMSServersAction">
    <property name="text">
     <string>&WMS Servers Editor...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolsTMSServersAction">
    <property name="text">
     <string>&TMS Servers Editor...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolsResetDiscardableAction">
    <property name="text">
     <string>&Reset Discardable dialogs status</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="gpsPopupAction">
    <property name="icon">
@@ -1528,6 +1660,9 @@
    <property name="text">
     <string>Create &Junction</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="editRotateAction">
    <property name="checkable">
@@ -1541,23 +1676,32 @@
     <string>Rotate</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+A</string>
+    <string notr="true">Ctrl+A</string>
    </property>
   </action>
   <action name="createPolygonAction">
    <property name="text">
     <string>&Polygon</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="createRectangleAction">
    <property name="text">
     <string>Rectangular &building</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="layersNewImageAction">
    <property name="text">
     <string>Add new &Image layer</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="windowFeatsAction">
    <property name="checkable">
@@ -1566,11 +1710,17 @@
    <property name="text">
     <string>Features</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="roadAddStreetNumbersAction">
    <property name="text">
     <string>Add street &numbers (Karlsruhe scheme)</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="roadSubdivideAction">
    <property name="icon">
@@ -1586,6 +1736,9 @@
    <property name="statusTip">
     <string>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewVirtualNodesAction">
    <property name="checkable">
@@ -1594,6 +1747,9 @@
    <property name="text">
     <string>Show &virtual nodes</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewShowLatLonGridAction">
    <property name="checkable">
@@ -1602,6 +1758,9 @@
    <property name="text">
     <string>Show lat/lon &grid</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewLockZoomAction">
    <property name="checkable">
@@ -1610,11 +1769,17 @@
    <property name="text">
     <string>&Lock zoom to tiled background</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolsProjectionsAction">
    <property name="text">
     <string>&Projections Editor...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewPhotosAction">
    <property name="checkable">
@@ -1623,16 +1788,25 @@
    <property name="text">
     <string>Show &Photos on map</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="exportOSCAction">
    <property name="text">
     <string>OsmChange (OSC)</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="featureDeleteAction">
    <property name="text">
     <string>Force Delete</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="layersOpenstreetbugsAction">
    <property name="text">
@@ -1654,11 +1828,17 @@
    <property name="statusTip">
     <string>Simplify way by removing unnecessary child nodes</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolsFiltersAction">
    <property name="text">
     <string>&Filters Editor...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="filterNoneAction">
    <property name="checkable">
@@ -1682,6 +1862,9 @@
    <property name="statusTip">
     <string>Join areas which are touching.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="areaSplitAction">
    <property name="icon">
@@ -1697,6 +1880,9 @@
    <property name="statusTip">
     <string>Split a selected area between two selected nodes into two separate areas.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="areaTerraceAction">
    <property name="icon">
@@ -1712,11 +1898,17 @@
    <property name="statusTip">
     <string>Split a selected area into terraced residences.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolsToolbarsAction">
    <property name="text">
     <string>Toolbar Editor...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="roadAxisAlignAction">
    <property name="icon">
@@ -1732,11 +1924,17 @@
    <property name="statusTip">
     <string>Align edges to a certain number of regularly spaced axes.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="filePrintAction">
    <property name="text">
     <string>&Print...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="filePrintPreviewAction">
    <property name="text">
@@ -1747,6 +1945,9 @@
    <property name="text">
     <string>Properties...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewDirtyAction">
    <property name="checkable">
@@ -1755,11 +1956,17 @@
    <property name="text">
     <string>Highlight dirt&y features</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="layersNewDrawingAction">
    <property name="text">
     <string>Add new &Drawing layer</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="editCutAction">
    <property name="icon">
@@ -1770,13 +1977,16 @@
     <string>Cu&t</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+X</string>
+    <string notr="true">Ctrl+X</string>
    </property>
   </action>
   <action name="layersNewFilterAction">
    <property name="text">
     <string>Add new &Filter layer</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="roadExtrudeAction">
    <property name="checkable">
@@ -1789,7 +1999,7 @@
     <string>Extrude interaction for ways (JOSM style)</string>
    </property>
    <property name="shortcut">
-    <string>Alt+X</string>
+    <string notr="true">Alt+X</string>
    </property>
   </action>
   <action name="featureSelectAction">
@@ -1801,6 +2011,9 @@
    <property name="text">
     <string>Include children in selection</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="editScaleAction">
    <property name="checkable">
@@ -1813,11 +2026,17 @@
    <property name="text">
     <string>Scale</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="fileSaveAsTemplateAction">
    <property name="text">
     <string>Save as Template Document...</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="actionCreate_Multipolygon">
    <property name="text">
@@ -1828,31 +2047,49 @@
    <property name="text">
     <string>Add to Multi&polygon</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="mapStyleSaveAction">
    <property name="text">
     <string>&Save</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="exportGDALAction">
    <property name="text">
     <string>GDAL SQLite/SpatiLite</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="roadBingExtractAction">
    <property name="text">
     <string>Bing Road Detector</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="toolsRebuildHistoryAction">
    <property name="text">
     <string>Rebuild &History</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="layersMapdustAction">
    <property name="text">
     <string>Add Map&Dust layer</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="viewWireframeAction">
    <property name="checkable">
@@ -1862,18 +2099,24 @@
     <string>Wireframe</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+W</string>
+    <string notr="true">Ctrl+Alt+W</string>
    </property>
   </action>
   <action name="featureSelectParentsAction">
    <property name="text">
     <string>Select parent(s)</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="featureDownloadMissingChildrenAction">
    <property name="text">
     <string>Download missing children</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="markBridgeAction">
    <property name="checkable">
diff --git a/src/PaintStyle/FeaturePainter.cpp b/src/PaintStyle/FeaturePainter.cpp
index 54e46c1..9fb2918 100644
--- a/src/PaintStyle/FeaturePainter.cpp
+++ b/src/PaintStyle/FeaturePainter.cpp
@@ -607,7 +607,7 @@ void FeaturePainter::drawPointLabel(QPointF C, QString str, QString strBg, QPain
 
     if (!str.isEmpty()) {
         modX = - (metrics.width(str)/2);
-        if (DrawIcon && (IconName != "") )
+        if (DrawIcon && !IconName.isEmpty() )
         {
             QImage pm(IconName);
             modY = - pm.height();
@@ -619,7 +619,7 @@ void FeaturePainter::drawPointLabel(QPointF C, QString str, QString strBg, QPain
     }
     if (DrawLabelBackground && !strBg.isEmpty()) {
         modX = - (metrics.width(strBg)/2);
-        if (DrawIcon && (IconName != "") )
+        if (DrawIcon && !IconName.isEmpty() )
         {
             QImage pm(IconName);
             modY = - pm.height();
@@ -656,8 +656,8 @@ void FeaturePainter::drawLabel(Node* Pt, QPainter* thePainter, MapRenderer* theR
     if (!DrawLabel)
         return;
 
-    QString str = Pt->tagValue(getLabelTag(), "");
-    QString strBg = Pt->tagValue(getLabelBackgroundTag(), "");
+    QString str = Pt->tagValue(getLabelTag(), QString());
+    QString strBg = Pt->tagValue(getLabelBackgroundTag(), QString());
 
     if (str.isEmpty() && strBg.isEmpty())
         return;
@@ -671,8 +671,8 @@ void FeaturePainter::drawLabel(Way* R, QPainter* thePainter, MapRenderer* theRen
     if (!DrawLabel)
         return;
 
-    QString str = R->tagValue(getLabelTag(), "");
-    QString strBg = R->tagValue(getLabelBackgroundTag(), "");
+    QString str = R->tagValue(getLabelTag(), QString());
+    QString strBg = R->tagValue(getLabelBackgroundTag(), QString());
     if (str.isEmpty() && strBg.isEmpty())
         return;
 
diff --git a/src/PaintStyle/Painter.cpp b/src/PaintStyle/Painter.cpp
index f102cd9..20d10d0 100644
--- a/src/PaintStyle/Painter.cpp
+++ b/src/PaintStyle/Painter.cpp
@@ -270,7 +270,7 @@ Painter Painter::fromXML(const QDomElement& e, QString filename)
             QDomElement t = n.toElement();
             if (t.tagName() == "selector")
             {
-                if (t.attribute("key") != "")
+                if (!t.attribute("key").isEmpty())
                     Pairs.push_back(qMakePair(t.attribute("key"),t.attribute("value")));
                 else
                 {
diff --git a/src/PaintStyle/PrimitivePainter.cpp b/src/PaintStyle/PrimitivePainter.cpp
index f1940e3..7a82c92 100644
--- a/src/PaintStyle/PrimitivePainter.cpp
+++ b/src/PaintStyle/PrimitivePainter.cpp
@@ -338,7 +338,7 @@ void PrimitivePainter::drawPointLabel(QPointF C, QString str, QString strBg, QPa
 
     if (!str.isEmpty()) {
         modX = - (metrics.width(str)/2);
-        if (DrawIcon && (IconName != "") )
+        if (DrawIcon && !IconName.isEmpty() )
         {
             QImage pm(IconName);
             modY = - pm.height();
@@ -350,7 +350,7 @@ void PrimitivePainter::drawPointLabel(QPointF C, QString str, QString strBg, QPa
     }
     if (DrawLabelBackground && !strBg.isEmpty()) {
         modX = - (metrics.width(strBg)/2);
-        if (DrawIcon && (IconName != "") )
+        if (DrawIcon && !IconName.isEmpty() )
         {
             QImage pm(IconName);
             modY = - pm.height();
diff --git a/src/Preferences/BookmarksList.cpp b/src/Preferences/BookmarksList.cpp
index 6093cb6..2840ef5 100644
--- a/src/Preferences/BookmarksList.cpp
+++ b/src/Preferences/BookmarksList.cpp
@@ -23,7 +23,7 @@ Bookmark::Bookmark()
 Bookmark::Bookmark(QString aName, CoordBox aCoord, bool Deleted)
     : Name(aName), Coordinates(aCoord), deleted(Deleted)
 {
-    if (Name == "") {
+    if (Name.isEmpty()) {
         Name = QApplication::translate("MerkaartorPreferences","New Bookmark");
     }
 }
diff --git a/src/Preferences/MerkaartorPreferences.cpp b/src/Preferences/MerkaartorPreferences.cpp
index 8d9570b..3556448 100644
--- a/src/Preferences/MerkaartorPreferences.cpp
+++ b/src/Preferences/MerkaartorPreferences.cpp
@@ -179,7 +179,7 @@
             if (g_Merk_Ignore_Preferences || g_Merk_Reset_Preferences) \
                 m_##Param = Default; \
             else { \
-                QString sColor = Sets->value(#Category"/"#Param, "").toString(); \
+                QString sColor = Sets->value(#Category"/"#Param, QString()).toString(); \
                 if (sColor.isEmpty() || !QColor(sColor).isValid()) \
                     m_##Param = Default; \
                 else \
@@ -216,7 +216,6 @@ Tool::Tool(QString Name, QString Path)
 }
 
 Tool::Tool()
-    : ToolName(""), ToolPath("")
 {
 }
 
@@ -278,7 +277,7 @@ MerkaartorPreferences::~MerkaartorPreferences()
 
 void MerkaartorPreferences::save(bool UserPwdChanged)
 {
-    if (g_Merk_Ignore_Preferences)
+    if (g_Merk_Ignore_Preferences || !saveOnline)
         return;
 
     Sets->setValue("version/version", QString("%1").arg(STRINGIFY(VERSION)));
@@ -295,13 +294,12 @@ void MerkaartorPreferences::save(bool UserPwdChanged)
     saveTagListFirstColumnWidth();
     Sets->sync();
 
-    // TODO: There is either some misnaming here or a bug. Why would settings
-    // be pulled from OSM only if the password changed, and pushed to OSM
-    // only otherwise?
+    /* If OSM login info has been changed, it might be a good idea to load new
+     * preferences from that user account. */
     if (UserPwdChanged)
         fromOsmPref();
-    else
-        toOsmPref();
+
+    toOsmPref();
 }
 
 void MerkaartorPreferences::toOsmPref()
@@ -387,6 +385,7 @@ void MerkaartorPreferences::on_authenticationRequired( QNetworkReply *reply, QAu
 }
 
 void MerkaartorPreferences::on_sslErrors(QNetworkReply *reply, const QList<QSslError>& errors) {
+    Q_UNUSED(reply);
     qDebug() << "We stumbled upon some SSL errors: ";
     foreach ( QSslError error, errors ) {
         qDebug() << "1:";
@@ -398,8 +397,13 @@ void MerkaartorPreferences::on_requestFinished ( QNetworkReply *reply )
 {
     int error = reply->error();
     if (error != QNetworkReply::NoError) {
-        qDebug() << "Received response with code " << error << "(" << reply->errorString() << ")";
+        //qDebug() << "Received response with code " << error << "(" << reply->errorString() << ")";
         switch (error) {
+            case QNetworkReply::HostNotFoundError:
+                qWarning() << "MerkaartorPreferences: Host not found, preferences won't be synchronized with your profile.";
+                /* We don't want to save local changes online, and possibly corrupt the store */
+                saveOnline = false;
+                break;
             case 406:
                 QMessageBox::critical(NULL,QApplication::translate("MerkaartorPreferences","Preferences upload failed"), QApplication::translate("MerkaartorPreferences","Duplicate key"));
                 return;
@@ -410,14 +414,12 @@ void MerkaartorPreferences::on_requestFinished ( QNetworkReply *reply )
                 QMessageBox::critical(NULL,QApplication::translate("MerkaartorPreferences","Preferences communication failed"), QApplication::translate("MerkaartorPreferences", "Communication error")+":\n"+reply->errorString());
                 return;
         }
-    } else {
-        qDebug() << "Received response.";
     }
 
     if (reply != OsmPrefLoadReply)
         return;
 
-    qDebug() << "Reading preferences.";
+    qDebug() << "Reading preferences from online profile.";
 
     QDomDocument aOsmPrefDoc;
     aOsmPrefDoc.setContent(reply, false);
@@ -530,6 +532,7 @@ void MerkaartorPreferences::initialize()
 {
 //  Use06Api = Sets->value("osm/use06api", "true").toBool();
     Use06Api = true;
+    saveOnline = true;
 
     // Proxy upgrade
     if (!g_Merk_Ignore_Preferences && !g_Merk_Reset_Preferences) {
@@ -589,7 +592,7 @@ void MerkaartorPreferences::initialize()
         }
     }
     if (!theToolList.contains("Inkscape")) {
-        Tool t("Inkscape", "");
+        Tool t("Inkscape", QString());
         theToolList.insert("Inkscape", t);
     }
 
@@ -601,7 +604,7 @@ void MerkaartorPreferences::initialize()
 	// about what do the fields mean. Same with TMS/servers.
         if (Servers.size()) {
             for (int i=0; i<Servers.size(); i+=7) {
-                WmsServer S(Servers[i], Servers[i+1], Servers[i+2], Servers[i+3], Servers[i+4], Servers[i+5], Servers[i+6], "", "");
+                WmsServer S(Servers[i], Servers[i+1], Servers[i+2], Servers[i+3], Servers[i+4], Servers[i+5], Servers[i+6], QString(), QString());
                 theWmsServerList.addServer(S);
             }
             save();
@@ -611,7 +614,7 @@ void MerkaartorPreferences::initialize()
         Servers = Sets->value("TMS/servers").toStringList();
         if (Servers.size()) {
             for (int i=0; i<Servers.size(); i+=6) {
-                TmsServer S(Servers[i], Servers[i+1], Servers[i+2], "EPSG:900913", Servers[i+3].toInt(), Servers[i+4].toInt(), Servers[i+5].toInt(), "", "");
+                TmsServer S(Servers[i], Servers[i+1], Servers[i+2], "EPSG:900913", Servers[i+3].toInt(), Servers[i+4].toInt(), Servers[i+5].toInt(), QString(), QString());
                 theTmsServerList.addServer(S);
             }
             save();
@@ -657,7 +660,9 @@ void MerkaartorPreferences::setUse06Api(bool b)
 
 M_PARAM_IMPLEMENT_BOOL(rightsidedriving, roadstructure, true);
 M_PARAM_IMPLEMENT_DOUBLE(doubleroaddistance, roadstructure, 20.);
-M_PARAM_IMPLEMENT_STRING(workingdir, general, "");
+M_PARAM_IMPLEMENT_DOUBLE(RoundaboutPrecision, roadstructure, 10.);
+M_PARAM_IMPLEMENT_INT(RoundaboutType, misc, 0);
+M_PARAM_IMPLEMENT_STRING(workingdir, general, QString());
 
 BookmarkList* MerkaartorPreferences::getBookmarks()
 {
@@ -688,7 +693,7 @@ TmsServerList* MerkaartorPreferences::getTmsServers()
 
 /* */
 
-M_PARAM_IMPLEMENT_STRING(SelectedServer, backgroundImage, "");
+M_PARAM_IMPLEMENT_STRING(SelectedServer, backgroundImage, QString());
 
 bool MerkaartorPreferences::getBgVisible() const
 {
@@ -729,7 +734,7 @@ QUuid MerkaartorPreferences::getBackgroundPlugin() const
 {
     QString s;
     if (!g_Merk_Ignore_Preferences && !g_Merk_Reset_Preferences) {
-        s = Sets->value("backgroundImage/BackgroundPlugin", "").toString();
+        s = Sets->value("backgroundImage/BackgroundPlugin", QString()).toString();
     }
     return QUuid(s);
 }
@@ -744,10 +749,10 @@ M_PARAM_IMPLEMENT_INT(CacheSize, backgroundImage, 0);
 
 /* Search */
 M_PARAM_IMPLEMENT_INT(LastMaxSearchResults, search, 999);
-M_PARAM_IMPLEMENT_STRING(LastSearchName, search, "");
-M_PARAM_IMPLEMENT_STRING(LastSearchKey, search, "");
-M_PARAM_IMPLEMENT_STRING(LastSearchValue, search, "");
-M_PARAM_IMPLEMENT_STRING(LastSearchTagSelector, search, "");
+M_PARAM_IMPLEMENT_STRING(LastSearchName, search, QString());
+M_PARAM_IMPLEMENT_STRING(LastSearchKey, search, QString());
+M_PARAM_IMPLEMENT_STRING(LastSearchValue, search, QString());
+M_PARAM_IMPLEMENT_STRING(LastSearchTagSelector, search, QString());
 /* Visuals */
 
 void MerkaartorPreferences::saveMainWindowState(const MainWindow * mainWindow)
@@ -866,9 +871,9 @@ ProjectionItem MerkaartorPreferences::getProjection(QString aProj)
 QString MerkaartorPreferences::getCurrentFilter()
 {
     if (!g_Merk_Ignore_Preferences && !g_Merk_Reset_Preferences)
-        return Sets->value("filter/Type", "").toString();
+        return Sets->value("filter/Type", QString()).toString();
     else
-        return "";
+        return QString();
 }
 
 FiltersList* MerkaartorPreferences::getFiltersList()
@@ -969,7 +974,7 @@ QString MerkaartorPreferences::getOsmWebsite() const
 #endif
 
     if (!u.path().isEmpty())
-        u.setPath("");
+        u.setPath(QString());
 
     return u.toString();
 }
@@ -990,7 +995,7 @@ void MerkaartorPreferences::setOsmWebsite(const QString & theValue)
         Sets->setValue("osm/Website", theValue);
 }
 
-M_PARAM_IMPLEMENT_STRING(XapiUrl, osm, "http://www.informationfreeway.org/api/0.6")
+M_PARAM_IMPLEMENT_STRING(XapiUrl, osm, "http://www.overpass-api.de/api/xapi_meta?")
 M_PARAM_IMPLEMENT_STRING(NominatimUrl, osm, "http://nominatim.openstreetmap.org/search")
 M_PARAM_IMPLEMENT_BOOL(AutoHistoryCleanup, data, true);
 
@@ -999,7 +1004,7 @@ QString MerkaartorPreferences::getOsmUser() const
     if (!g_Merk_Ignore_Preferences && !g_Merk_Reset_Preferences)
         return Sets->value("osm/User").toString();
     else
-        return "";
+        return QString();
 }
 
 void MerkaartorPreferences::setOsmUser(const QString & theValue)
@@ -1013,7 +1018,7 @@ QString MerkaartorPreferences::getOsmPassword() const
     if (!g_Merk_Ignore_Preferences && !g_Merk_Reset_Preferences)
         return Sets->value("osm/Password").toString();
     else
-        return "";
+        return QString();
 }
 
 void MerkaartorPreferences::setOsmPassword(const QString & theValue)
@@ -1181,7 +1186,7 @@ M_PARAM_IMPLEMENT_BOOL(UseAntiAlias, style, true)
 M_PARAM_IMPLEMENT_BOOL(AntiAliasWhilePanning, style, false)
 M_PARAM_IMPLEMENT_BOOL(UseStyledWireframe, style, false)
 M_PARAM_IMPLEMENT_STRING(DefaultStyle, style, ":/Styles/Mapnik.mas")
-M_PARAM_IMPLEMENT_STRING(CustomStyle, style, "")
+M_PARAM_IMPLEMENT_STRING(CustomStyle, style, QString())
 M_PARAM_IMPLEMENT_BOOL(DisableStyleForTracks, style, true)
 M_PARAM_IMPLEMENT_STRINGLIST(TechnicalTags, style, TECHNICAL_TAGS)
 M_PARAM_IMPLEMENT_INT(EditRendering, style, 0)
@@ -1220,7 +1225,7 @@ M_PARAM_IMPLEMENT_BOOL(WireframeView, visual, false)
 
 /* Templates */
 M_PARAM_IMPLEMENT_STRING(DefaultTemplate, templates, ":/Templates/default.mat")
-M_PARAM_IMPLEMENT_STRING(CustomTemplate, templates, "")
+M_PARAM_IMPLEMENT_STRING(CustomTemplate, templates, QString())
 
 /* GPS */
 #ifdef Q_OS_WIN
@@ -1234,7 +1239,7 @@ M_PARAM_IMPLEMENT_STRING(GpsdHost, gps, "localhost")
 M_PARAM_IMPLEMENT_INT(GpsdPort, gps, 2947)
 M_PARAM_IMPLEMENT_BOOL(GpsSaveLog, gps, false)
 M_PARAM_IMPLEMENT_BOOL(GpsMapCenter, gps, false)
-M_PARAM_IMPLEMENT_STRING(GpsLogDir, gps, "")
+M_PARAM_IMPLEMENT_STRING(GpsLogDir, gps, QString())
 M_PARAM_IMPLEMENT_BOOL(GpsSyncTime, gps, false)
 
 M_PARAM_IMPLEMENT_BOOL(ResolveRelations, downloadosm, false)
@@ -1251,11 +1256,10 @@ M_PARAM_IMPLEMENT_BOOL(TranslateTags, locale, true)
 M_PARAM_IMPLEMENT_BOOL(AutoSourceTag, backgroundImage, true)
 
 /* Data */
-M_PARAM_IMPLEMENT_STRING(OpenStreetBugsUrl, data, "http://openstreetbugs.schokokeks.org/api/0.1/")
 M_PARAM_IMPLEMENT_STRING(MapdustUrl, data, "http://www.mapdust.com/feed?lang=en&ft=wrong_turn,bad_routing,oneway_road,blocked_street,missing_street,wrong_roundabout,missing_speedlimit,other&fd=1&minR=&maxR=")
-M_PARAM_IMPLEMENT_BOOL(GdalConfirmProjection, data, false)
+M_PARAM_IMPLEMENT_BOOL(GdalConfirmProjection, data, true)
 M_PARAM_IMPLEMENT_BOOL(HasAutoLoadDocument, data, false)
-M_PARAM_IMPLEMENT_STRING(AutoLoadDocumentFilename, data, "")
+M_PARAM_IMPLEMENT_STRING(AutoLoadDocumentFilename, data, QString())
 
 /* Mouse bevaviour */
 #ifdef _MOBILE
@@ -1331,16 +1335,17 @@ QNetworkProxy MerkaartorPreferences::getProxy(const QUrl & requestUrl)
 }
 
 M_PARAM_IMPLEMENT_BOOL(ProxyUse, proxy, false)
-M_PARAM_IMPLEMENT_STRING(ProxyHost, proxy, "")
+M_PARAM_IMPLEMENT_STRING(ProxyHost, proxy, QString())
 M_PARAM_IMPLEMENT_INT(ProxyPort, proxy, 8080)
-M_PARAM_IMPLEMENT_STRING(ProxyUser, proxy, "")
-M_PARAM_IMPLEMENT_STRING(ProxyPassword, proxy, "")
+M_PARAM_IMPLEMENT_STRING(ProxyUser, proxy, QString())
+M_PARAM_IMPLEMENT_STRING(ProxyPassword, proxy, QString())
 
 /* Track */
 M_PARAM_IMPLEMENT_BOOL(ReadonlyTracksDefault, data, false)
 
 /* FeaturesDock */
 M_PARAM_IMPLEMENT_BOOL(FeaturesWithin, FeaturesDock, true)
+M_PARAM_IMPLEMENT_BOOL(FeaturesSelectionFilter, FeaturesDock, true)
 
 namespace {
 
@@ -1348,7 +1353,7 @@ namespace {
 // on the platform. This method returns the list of directories to load
 // preference XMLs from.
 QStringList getPreferenceDirectories() {
-    QList<QString> directories;
+    QStringList directories;
     directories << HOMEDIR;
     // TODO: Some files are loaded without this override for Q_OS_MAC. Why?
 #if defined(Q_OS_MAC)
@@ -1368,7 +1373,7 @@ QStringList getPreferenceDirectories() {
 // Returns the list of all alternative locations of the given preference
 // file.
 QStringList getPreferenceFilePaths(QString fileName) {
-    QList<QString> paths;
+    QStringList paths;
     const QStringList directories = getPreferenceDirectories();
     for (QStringList::const_iterator i = directories.begin(); i != directories.end(); ++i) {
 	paths << (*i) + "/" + fileName;
@@ -1684,7 +1689,7 @@ QString getDefaultLanguage(bool returnDefault)
         QSettings* sets = getSettings();
         QString lang = sets->value("locale/language").toString();
         delete sets;
-        if (lang == "")
+        if (lang.isEmpty())
             if (returnDefault)
                 lang = QLocale::system().name().split("_")[0];
         return lang;
@@ -1692,7 +1697,7 @@ QString getDefaultLanguage(bool returnDefault)
         if (returnDefault)
             return QLocale::system().name().split("_")[0];
         else
-            return "";
+            return QString();
     }
 }
 
diff --git a/src/Preferences/MerkaartorPreferences.h b/src/Preferences/MerkaartorPreferences.h
index bab0768..0d2a9c4 100644
--- a/src/Preferences/MerkaartorPreferences.h
+++ b/src/Preferences/MerkaartorPreferences.h
@@ -183,6 +183,8 @@ public:
     qreal apiVersionNum() const;
 
     M_PARAM_DECLARE_BOOL(rightsidedriving);
+    M_PARAM_DECLARE_DOUBLE(RoundaboutPrecision);
+    M_PARAM_DECLARE_INT(RoundaboutType);
     M_PARAM_DECLARE_DOUBLE(doubleroaddistance);
     M_PARAM_DECLARE_STRING(workingdir);
 
@@ -390,6 +392,7 @@ public:
 
     /* FeaturesDock */
     M_PARAM_DECLARE_BOOL(FeaturesWithin)
+    M_PARAM_DECLARE_BOOL(FeaturesSelectionFilter)
 
     /* Plugins */
     void addBackgroundPlugin(IMapAdapterFactory* aPlugin);
@@ -456,6 +459,7 @@ private:
 
     bool Use06Api;
     QString version;
+    bool saveOnline;
 
     // TODO: These network objects shouldn't be shared between methods
     // of MerkaartorPreferences.
diff --git a/src/Preferences/TMSPreferencesDialog.cpp b/src/Preferences/TMSPreferencesDialog.cpp
index e6e7a34..d25710d 100644
--- a/src/Preferences/TMSPreferencesDialog.cpp
+++ b/src/Preferences/TMSPreferencesDialog.cpp
@@ -115,7 +115,7 @@ void TMSPreferencesDialog::on_btDelTmsServer_clicked(void)
         return;
 
     theTmsServers[idx].deleted = true;
-    delete lvTmsServers->takeItem(idx);
+    delete lvTmsServers->takeItem(lvTmsServers->currentRow());
     on_lvTmsServers_itemSelectionChanged();
 }
 
@@ -215,7 +215,7 @@ void TMSPreferencesDialog::savePrefs()
 void TMSPreferencesDialog::on_btGetServices_clicked()
 {
     QUrl theUrl(edTmsUrl->text());
-    if ((theUrl.host() == "") || (theUrl.path() == "")) {
+    if (theUrl.host().isEmpty() || theUrl.path().isEmpty()) {
         QMessageBox::critical(this, tr("Merkaartor: GetServices"), tr("Address and Path cannot be blank."), QMessageBox::Ok);
     }
 
@@ -268,8 +268,10 @@ void TMSPreferencesDialog::httpRequestFinished( QNetworkReply *reply)
     qDebug() << "TMS: request finished.";
     reply->deleteLater();
     if (reply->error()) {
-        if (reply->error() != QNetworkReply::OperationCanceledError)
-            QMessageBox::critical(this, tr("Merkaartor: GetServices"), tr("Error reading services.\n") + reply->errorString(), QMessageBox::Ok);
+        if (reply->error() != QNetworkReply::OperationCanceledError) {
+            QMessageBox::critical(this, tr("Merkaartor: GetServices"), tr("Error reading services. The server probably does not support this feature.\n"), QMessageBox::Ok);
+            qDebug() << "TMS GetServices error: " << reply->errorString();
+        }
         return;
     }
 
diff --git a/src/Preferences/TMSPreferencesDialog.ui b/src/Preferences/TMSPreferencesDialog.ui
index cf2be07..18cb9d9 100644
--- a/src/Preferences/TMSPreferencesDialog.ui
+++ b/src/Preferences/TMSPreferencesDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>550</width>
-    <height>489</height>
+    <width>594</width>
+    <height>551</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -139,12 +139,11 @@
             </item>
             <item>
              <widget class="QLabel" name="label_6">
+              <property name="styleSheet">
+               <string notr="true">QLabel { font-weight: bold; }</string>
+              </property>
               <property name="text">
-               <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></string>
+               <string>This is a standard TMS server.</string>
               </property>
              </widget>
             </item>
diff --git a/src/Preferences/TmsServersList.cpp b/src/Preferences/TmsServersList.cpp
index c2b008f..95f59b5 100644
--- a/src/Preferences/TmsServersList.cpp
+++ b/src/Preferences/TmsServersList.cpp
@@ -17,7 +17,7 @@
 
 TmsServer::TmsServer()
 {
-    TmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "EPSG:3857", 256, 0, 17, "", "");
+    TmsServer(QApplication::translate("MerkaartorPreferences","New Server"), QString(), QString(), "EPSG:3857", 256, 0, 17, QString(), QString());
 }
 
 TmsServer::TmsServer(QString Name, QString Adress, QString Path, QString Projection, int tileSize, int minZoom, int maxZoom, QString SourceTag, QString LicenseUrl, QString baseUrl, bool Origin, bool Deleted)
@@ -34,7 +34,7 @@ TmsServer::TmsServer(QString Name, QString Adress, QString Path, QString Project
     , TmsBlOrigin(Origin)
     , deleted(Deleted)
 {
-    if (Name == "") {
+    if (Name.isEmpty()) {
         TmsName = QApplication::translate("MerkaartorPreferences","New Server");
     }
 }
@@ -148,7 +148,7 @@ void TmsServersList::toXml(QDomElement parent)
 {
     QDomElement rt = parent.ownerDocument().createElement("TmsServers");
     parent.appendChild(rt);
-    rt.setAttribute("creator", QString("%1 v%2%3").arg(STRINGIFY(PRODUCT)).arg(STRINGIFY(VERSION)).arg(STRINGIFY(REVISION)));
+    rt.setAttribute("creator", QString("%1 v%2").arg(STRINGIFY(PRODUCT)).arg(STRINGIFY(VERSION)));
 
     TmsServerListIterator it(theServers);
     while (it.hasNext()) {
diff --git a/src/Preferences/TmsServersList.h b/src/Preferences/TmsServersList.h
index 62c7ebc..256e008 100644
--- a/src/Preferences/TmsServersList.h
+++ b/src/Preferences/TmsServersList.h
@@ -21,7 +21,7 @@ class TmsServer
 {
     public:
         TmsServer();
-        TmsServer(QString Name, QString Adress, QString Path, QString Projection, int tileSize, int minZoom, int maxZoom, QString SourceTag, QString LicenseUrl, QString TmsBaseUrl = "", bool Origin=false, bool Deleted=false);
+        TmsServer(QString Name, QString Adress, QString Path, QString Projection, int tileSize, int minZoom, int maxZoom, QString SourceTag, QString LicenseUrl, QString TmsBaseUrl = QString(), bool Origin=false, bool Deleted=false);
 
         void toXml(QDomElement parent);
         static TmsServer fromXml(QDomElement parent);
diff --git a/src/Preferences/WMSPreferencesDialog.cpp b/src/Preferences/WMSPreferencesDialog.cpp
index 1cfd5b8..ec3e6c7 100644
--- a/src/Preferences/WMSPreferencesDialog.cpp
+++ b/src/Preferences/WMSPreferencesDialog.cpp
@@ -35,15 +35,13 @@ WMSPreferencesDialog::WMSPreferencesDialog(QWidget* parent)
     loadPrefs();
 
     edWmsLayers->setVisible(false);
-    lblWMSC->setVisible(false);
     frWmsSettings->setVisible(true);
     isTiled = 0;
     frTileIt->setEnabled(false);
     edWmsUrl->setValidator(&wmsValid);
 
     connect(tvWmsLayers, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(on_tvWmsLayers_itemChanged(QTreeWidgetItem *, int)));
-    connect (&m_networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(httpRequestFinished(QNetworkReply *)));
-
+    connect(&m_networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(httpRequestFinished(QNetworkReply *)));
 }
 
 WMSPreferencesDialog::~WMSPreferencesDialog()
@@ -219,7 +217,7 @@ void WMSPreferencesDialog::on_lvWmsServers_itemSelectionChanged()
     frTileIt->setEnabled(false);
     cbTileIt->setChecked(false);
     sbZoomLevels->setValue(0);
-    lblWMSC->setVisible(false);
+    setStatus( Empty );
     frWmsSettings->setVisible(true);
     isTiled = 0;
     selWmscLayer = WmscLayer();
@@ -365,7 +363,7 @@ void WMSPreferencesDialog::showCapabilities(void)
 #else
 #define theQuery theUrl
 #endif
-    if ((theUrl.host() == "") || (theUrl.path() == "")) {
+    if (theUrl.host().isEmpty() || theUrl.path().isEmpty()) {
         QMessageBox::critical(this, tr("Merkaartor: GetCapabilities"), tr("Address and Path cannot be blank."), QMessageBox::Ok);
     }
 
@@ -416,10 +414,13 @@ void WMSPreferencesDialog::httpRequestFinished(QNetworkReply * reply)
     if (reply != curReply)
         return;
 
+    setStatus( Empty );
+
     int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
     if (reply->error() != QNetworkReply::NoError) {
         if (reply->error() != QNetworkReply::OperationCanceledError)
-            QMessageBox::critical(this, tr("Merkaartor: GetCapabilities"), tr("Error reading capabilities.\n") + reply->errorString(), QMessageBox::Ok);
+            setStatus( ErrorGetCapabilities, reply->errorString() );
+            //QMessageBox::critical(this, tr("Merkaartor: GetCapabilities"), tr("Error reading capabilities.\n") + reply->errorString(), QMessageBox::Ok);
     } else {
         switch (statusCode) {
             case 200:
@@ -433,16 +434,18 @@ void WMSPreferencesDialog::httpRequestFinished(QNetworkReply * reply)
                 curReply = NULL;
                 return;
             default:
+                QString reason = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
+                setStatus( ErrorGetCapabilities, reason);
+                /*
                 QMessageBox::information(this, tr("Merkaartor: GetCapabilities"),
                                   tr("Download failed: %1.")
-                                  .arg(statusCode));
+                                  .arg(statusCode)); */
                 curReply->deleteLater();
                 curReply = NULL;
                 return;
         }
     }
 
-    lblWMSC->setVisible(false);
     frWmsSettings->setVisible(true);
     isTiled = 0;
 
@@ -511,6 +514,8 @@ void WMSPreferencesDialog::httpRequestFinished(QNetworkReply * reply)
     if (!vendorElem.isNull()) {
         parseVendorSpecific(vendorElem);
     }
+
+    tvWmsLayers->setCurrentItem(tvWmsLayers->topLevelItem(0));
 }
 
 void WMSPreferencesDialog::parseVendorSpecific(QDomElement &vendorElem)
@@ -529,7 +534,7 @@ void WMSPreferencesDialog::parseVendorSpecific(QDomElement &vendorElem)
 
 void WMSPreferencesDialog::parseTileSet(QDomElement &tilesetElem, WmscLayer &aLayer)
 {
-    lblWMSC->setVisible(true);
+    setStatus( Caching );
     frWmsSettings->setVisible(false);
     isTiled = 1;
 
@@ -574,23 +579,28 @@ QTreeWidgetItem * WMSPreferencesDialog::parseLayer(const QDomElement& aLayerElem
     QDomElement title = aLayerElem.firstChildElement("Title");
     QDomElement name = aLayerElem.firstChildElement("Name");
 
+    QString theTitle, theName;
+    if (!name.isNull())
+        theName = name.firstChild().nodeValue();
+    if (!title.isNull()) {
+        theTitle = title.firstChild().nodeValue();
+    } else theTitle = tr("Unnamed layer");
+
+
     QTreeWidgetItem *newItem = new QTreeWidgetItem;
     newItem->setFlags(Qt::NoItemFlags |Qt::ItemIsEnabled);
-    if (!name.isNull())
-        newItem->setText(0,name.firstChild().nodeValue());
-    else {
-        if (!title.isNull())
-            newItem->setText(0,title.firstChild().nodeValue());
-        else
-            newItem->setText(0,tr("Unnamed"));
-    }
 
-    if (!title.isNull())
+
+    newItem->setText(0,theTitle);
+    newItem->setText(1,theName);
+
+    if (!title.isNull()) {
         newItem->setToolTip(0, title.firstChild().nodeValue());
+    } else {
+        newItem->setToolTip(0, tr("Untitled"));
+    }
 
-    QString theName;
     if (!name.isNull()) {
-        theName = name.firstChild().nodeValue();
         newItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsSelectable | Qt::ItemIsEnabled);
         newItem->setData(0, Qt::UserRole, theName);
         newItem->setCheckState(0, Qt::Unchecked);
@@ -640,14 +650,51 @@ QTreeWidgetItem * WMSPreferencesDialog::parseLayer(const QDomElement& aLayerElem
     }
 
     tvWmsLayers->expandItem(newItem);
+    tvWmsLayers->header()->setStretchLastSection(false);
+#ifdef QT5
+    tvWmsLayers->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#else
+    tvWmsLayers->header()->setResizeMode(QHeaderView::ResizeToContents);
+#endif
     return newItem;
 }
 
+void WMSPreferencesDialog::setStatus( WMSStatus status, QString message ) {
+    switch (status) {
+        case Caching:
+            lblStatus->setText(tr("This is a caching WMS server."));
+            break;
+        case ErrorNetwork:
+            lblStatus->setText(tr("Could not contact WMS server: %1").arg(message));
+            break;
+        case ErrorGetCapabilities:
+            lblStatus->setText(tr("Could not get capabilities: %1").arg(message));
+            break;
+        default:
+            lblStatus->setText(QString());
+    }
+
+    if (status > Error) {
+        lblStatus->setStyleSheet("QLabel { color : red; }");
+    } else {
+        lblStatus->setStyleSheet(QString());
+    }
+}
+
+void WMSPreferencesDialog::setTreeCheckState(Qt::CheckState state, QTreeWidgetItem *twi) {
+    twi->setCheckState(0, state);
+    for (int i = 0; i < twi->childCount(); i++)
+        setTreeCheckState(state, twi->child(i));
+}
+
 void WMSPreferencesDialog::on_tvWmsLayers_itemChanged(QTreeWidgetItem *twi, int)
 {
     QStringList theLayers;
     bool hasSelection = false;
 
+    /* Set the checkbox status recursively for the whole subtree */
+    setTreeCheckState(twi->checkState(0), twi);
+
     if (isTiled == 1 && twi->checkState(0) == Qt::Checked) {
         theLayers.append(twi->data(0, Qt::UserRole).toString());
         hasSelection = true;
diff --git a/src/Preferences/WMSPreferencesDialog.h b/src/Preferences/WMSPreferencesDialog.h
index 86f6593..9b949e5 100644
--- a/src/Preferences/WMSPreferencesDialog.h
+++ b/src/Preferences/WMSPreferencesDialog.h
@@ -19,6 +19,7 @@
 
 #include <ui_WMSPreferencesDialog.h>
 #include "MerkaartorPreferences.h"
+#include "Global.h"
 
 #include <QList>
 #include <QtXml>
@@ -109,6 +110,14 @@ public slots:
     void on_tvWmsLayers_currentItemChanged ( QTreeWidgetItem * current, QTreeWidgetItem * previous );
 
 private:
+    enum WMSStatus {
+       Empty,
+       Caching,
+       Error,
+       ErrorNetwork,
+       ErrorGetCapabilities,
+    };
+
     void updateUrl();
     void loadPrefs();
     void savePrefs();
@@ -118,8 +127,12 @@ private:
     void parseVendorSpecific(QDomElement& vendorElem);
     void parseTileSet(QDomElement& tilesetElem, WmscLayer& aLayer);
 
+    void setTreeCheckState(Qt::CheckState state, QTreeWidgetItem *twi);
+    void setStatus( WMSStatus status, QString message = QString() );
+
     void refreshStyles();
 
+
 public:
     QList<WmsServer> theWmsServers;
     QString getSelectedServer();
diff --git a/src/Preferences/WMSPreferencesDialog.ui b/src/Preferences/WMSPreferencesDialog.ui
index 878d90e..e2765e0 100644
--- a/src/Preferences/WMSPreferencesDialog.ui
+++ b/src/Preferences/WMSPreferencesDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>586</width>
-    <height>583</height>
+    <width>797</width>
+    <height>718</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -129,23 +129,27 @@
          <item>
           <widget class="QTreeWidget" name="tvWmsLayers">
            <property name="headerHidden">
-            <bool>true</bool>
+            <bool>false</bool>
+           </property>
+           <property name="columnCount">
+            <number>2</number>
            </property>
            <column>
             <property name="text">
-             <string>1</string>
+             <string>Title</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string notr="true">Name</string>
             </property>
            </column>
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="lblWMSC">
+          <widget class="QLabel" name="lblStatus">
            <property name="text">
-            <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
+            <string notr="true"/>
            </property>
            <property name="openExternalLinks">
             <bool>true</bool>
@@ -226,9 +230,6 @@ p, li { white-space: pre-wrap; }
                 </widget>
                </item>
               </layout>
-              <zorder>cbTileIt</zorder>
-              <zorder>label_2</zorder>
-              <zorder>sbZoomLevels</zorder>
              </widget>
             </item>
             <item>
@@ -314,19 +315,6 @@ p, li { white-space: pre-wrap; }
           </layout>
          </item>
          <item>
-          <spacer>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>1</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
             <widget class="QPushButton" name="btApplyWmsServer">
diff --git a/src/Preferences/WmsServersList.cpp b/src/Preferences/WmsServersList.cpp
index 93216fc..1a892c3 100644
--- a/src/Preferences/WmsServersList.cpp
+++ b/src/Preferences/WmsServersList.cpp
@@ -17,7 +17,7 @@
 
 WmsServer::WmsServer()
 {
-    WmsServer(QApplication::translate("MerkaartorPreferences","New Server"), "", "", "", "", "", "", "", "");
+    WmsServer(QApplication::translate("MerkaartorPreferences","New Server"), QString(), QString(), QString(), QString(), QString(), QString(), QString(), QString());
 }
 
 WmsServer::WmsServer(QString Name, QString Adress, QString Path, QString Layers
@@ -36,7 +36,7 @@ WmsServer::WmsServer(QString Name, QString Adress, QString Path, QString Layers
     , WmsCLayer(CLayer)
     , deleted(Deleted)
 {
-    if (Name == "") {
+    if (Name.isEmpty()) {
         WmsName = QApplication::translate("MerkaartorPreferences","New Server");
     }
 }
@@ -208,7 +208,7 @@ void WmsServersList::toXml(QDomElement parent)
 {
     QDomElement rt = parent.ownerDocument().createElement("WmsServers");
     parent.appendChild(rt);
-    rt.setAttribute("creator", QString("%1 v%2%3").arg(STRINGIFY(PRODUCT)).arg(STRINGIFY(VERSION)).arg(STRINGIFY(REVISION)));
+    rt.setAttribute("creator", QString("%1 v%2").arg(STRINGIFY(PRODUCT)).arg(STRINGIFY(VERSION)));
 
     WmsServerListIterator it(theServers);
     while (it.hasNext()) {
diff --git a/src/QMapControl/WmscMapAdapter.h b/src/QMapControl/WmscMapAdapter.h
index baa6843..ef9d53a 100644
--- a/src/QMapControl/WmscMapAdapter.h
+++ b/src/QMapControl/WmscMapAdapter.h
@@ -86,7 +86,7 @@ public:
 
     virtual bool isValid(int x, int y, int z) const;
     virtual QString getQuery(int x, int y, int z) const;
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return ""; }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return QString(); }
     virtual QPixmap getPixmap(const QRectF& /* wgs84Bbox */, const QRectF& /* projBbox */, const QRect& /* size */) const { return QPixmap(); }
 
     virtual QString projection() const;
@@ -100,7 +100,7 @@ public:
 
     virtual bool toXML(QXmlStreamWriter& /*stream*/) { return true; }
     virtual void fromXML(QXmlStreamReader& /*xParent*/) {}
-    virtual QString toPropertiesHtml() {return "";}
+    virtual QString toPropertiesHtml() {return QString();}
 
     virtual void setSettings(QSettings* /*aSet*/) {}
 
diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp
index 42eda0e..468cf2b 100644
--- a/src/QMapControl/browserimagemanager.cpp
+++ b/src/QMapControl/browserimagemanager.cpp
@@ -125,7 +125,7 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
 }
 #else
 BrowserImageManager::BrowserImageManager(QObject* parent)
-    :QObject(parent), emptyPixmap(QPixmap(1,1)), errorPixmap(QPixmap(512,512)), page(0)
+    :QObject(parent), emptyPixmap(QPixmap(1,1)), errorPixmap(QPixmap(512,512)), page(0), timeoutTimer(new QTimer(this))
 {
     errorPixmap.fill(Qt::gray);
     QPainter P(&errorPixmap);
@@ -143,7 +143,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
 
     connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool)));
 
-    timeoutTimer = new QTimer();
     connect(timeoutTimer, SIGNAL(timeout()), this, SLOT(timeout()));
     timeoutTimer->setInterval(M_PREFS->getNetworkTimeout());
 
@@ -156,10 +155,9 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
 
 BrowserImageManager::~BrowserImageManager()
 {
-    delete timeoutTimer;
 }
 
-QByteArray BrowserImageManager::getData(IMapAdapter* anAdapter, QString url)
+QByteArray BrowserImageManager::getData(IMapAdapter* anAdapter, const QString &url)
 {
     QImage pm = getImage(anAdapter, url);
     QBuffer buf;
@@ -167,13 +165,13 @@ QByteArray BrowserImageManager::getData(IMapAdapter* anAdapter, QString url)
     return buf.buffer();
 }
 
-QImage BrowserImageManager::getImage(IMapAdapter* anAdapter, QString url)
+QImage BrowserImageManager::getImage(IMapAdapter* anAdapter, const QString &url)
 {
 //	QPixmap pm(emptyPixmap);
     QPixmap pm;
 
     QString host = anAdapter->getHost();
-    QString strHash = QString("%1%2").arg(anAdapter->getName()).arg(url);
+    QString strHash = anAdapter->getName() + url;
     QString hash = QString(strHash.toLatin1().toBase64());
     if (hash.size() > 255) {
         QCryptographicHash crypt(QCryptographicHash::Md5);
@@ -309,10 +307,7 @@ QImage BrowserImageManager::prefetchImage(IMapAdapter* anAdapter, int x, int y,
 
 void BrowserImageManager::receivedData(const QByteArray& /* ba */, const QHash<QString, QString>& /* headers */, const QString& hash)
 {
-    if (prefetch.contains(hash))
-    {
-        prefetch.removeAt(prefetch.indexOf(hash));
-    }
+    prefetch.removeOne(hash);
     emit(dataReceived());
 }
 
diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h
index d7abac6..10f8a47 100644
--- a/src/QMapControl/browserimagemanager.h
+++ b/src/QMapControl/browserimagemanager.h
@@ -77,8 +77,8 @@ class BrowserImageManager : public QObject, public IImageManager
          * @param path the path to the image
          * @return the pixmap of the asked image
          */
-        QImage getImage(IMapAdapter* anAdapter, QString url);
-        QByteArray getData(IMapAdapter* anAdapter, QString url);
+        QImage getImage(IMapAdapter* anAdapter, const QString &url);
+        QByteArray getData(IMapAdapter* anAdapter, const QString &url);
 
         //QPixmap prefetchImage(const QString& host, const QString& path);
         QImage prefetchImage(IMapAdapter* anAdapter, int x, int y, int z);
@@ -106,7 +106,7 @@ class BrowserImageManager : public QObject, public IImageManager
     private:
         QPixmap emptyPixmap;
         QPixmap errorPixmap;
-        QList<QString> prefetch;
+        QStringList prefetch;
 
         QQueue<LoadingRequest> loadingRequests;
         bool requestActive;
diff --git a/src/QMapControl/imagemanager.cpp b/src/QMapControl/imagemanager.cpp
index fcf3aad..957314f 100644
--- a/src/QMapControl/imagemanager.cpp
+++ b/src/QMapControl/imagemanager.cpp
@@ -44,10 +44,10 @@ ImageManager::~ImageManager()
     delete net;
 }
 
-QByteArray ImageManager::getData(IMapAdapter* anAdapter, QString url)
+QByteArray ImageManager::getData(IMapAdapter* anAdapter, const QString &url)
 {
     QString host = anAdapter->getHost();
-    QString strHash = QString("%1%2").arg(anAdapter->getName()).arg(url);
+    QString strHash = anAdapter->getName() + url;
     QString hash = QString(strHash.toLatin1().toBase64());
     if (hash.size() > 255) {
         QCryptographicHash crypt(QCryptographicHash::Md5);
@@ -72,12 +72,12 @@ QByteArray ImageManager::getData(IMapAdapter* anAdapter, QString url)
     return ba;
 }
 
-QImage ImageManager::getImage(IMapAdapter* anAdapter, QString url)
+QImage ImageManager::getImage(IMapAdapter* anAdapter, const QString &url)
 {
 // 	qDebug() << "ImageManager::getImage";
 
     QString host = anAdapter->getHost();
-    QString strHash = QString("%1%2").arg(anAdapter->getName()).arg(url);
+    QString strHash = anAdapter->getName() + url;
     QString hash = QString(strHash.toLatin1().toBase64());
     if (hash.size() > 255) {
         QCryptographicHash crypt(QCryptographicHash::Md5);
@@ -154,10 +154,7 @@ void ImageManager::receivedData(const QByteArray& ba, const QHash<QString, QStri
         }
     }
 
-    if (prefetch.contains(hash))
-    {
-        prefetch.removeAt(prefetch.indexOf(hash));
-    }
+    prefetch.removeOne(hash);
     emit(dataReceived());
 }
 
diff --git a/src/QMapControl/imagemanager.h b/src/QMapControl/imagemanager.h
index 5b115fe..fca6f64 100644
--- a/src/QMapControl/imagemanager.h
+++ b/src/QMapControl/imagemanager.h
@@ -52,8 +52,8 @@ class ImageManager : public QObject, public IImageManager
          * @param path the path to the image
          * @return the pixmap of the asked image
          */
-        QImage getImage(IMapAdapter* anAdapter, QString url);
-        QByteArray getData(IMapAdapter* anAdapter, QString url);
+        QImage getImage(IMapAdapter* anAdapter, const QString &url);
+        QByteArray getData(IMapAdapter* anAdapter, const QString &url);
 
         //QPixmap prefetchImage(const QString& host, const QString& path);
         QImage prefetchImage(IMapAdapter* anAdapter, int x, int y, int z);
@@ -81,7 +81,7 @@ class ImageManager : public QObject, public IImageManager
     private:
         QPixmap emptyPixmap;
         MapNetwork* net;
-        QList<QString> prefetch;
+        QStringList prefetch;
 
         static ImageManager* m_ImageManagerInstance;
 
diff --git a/src/QMapControl/mapcontrol.cpp b/src/QMapControl/mapcontrol.cpp
index d6b8166..603c24d 100644
--- a/src/QMapControl/mapcontrol.cpp
+++ b/src/QMapControl/mapcontrol.cpp
@@ -51,7 +51,7 @@ Layer* MapControl::getLayer(const QString& layername) const
 	return layermanager->getLayer(layername);
 }
 
-QList<QString> MapControl::getLayers() const
+QStringList MapControl::getLayers() const
 {
 	return layermanager->getLayers();
 }
diff --git a/src/QMapControl/mapcontrol.h b/src/QMapControl/mapcontrol.h
index 3535859..1a092a9 100644
--- a/src/QMapControl/mapcontrol.h
+++ b/src/QMapControl/mapcontrol.h
@@ -85,9 +85,9 @@ class MapControl : public QWidget
 		
 		//! returns the names of all layers
 		/*!
-		 * @return returns a QList with the names of all layers
+		 * @return returns a QStringList with the names of all layers
 		 */
-		QList<QString> getLayers() const;
+		QStringList getLayers() const;
 		
 		//! returns the number of existing layers
 		/*!
@@ -157,7 +157,7 @@ class MapControl : public QWidget
 		 * The MouesMode Dragging draws an rectangular in the map while the MouseButton is pressed.
 		 * When the Button is released a draggedRect() signal is emitted.
 		 * 
-		 * The second MouseMode (the default) is Panning, which allows to drag the map around.
+		 * The second MouseMode (the default) is Panning, which allows dragging the map around.
 		 * @param mousemode the MouseMode
 		 */
 		void setMouseMode(MouseMode mousemode);
@@ -204,7 +204,7 @@ class MapControl : public QWidget
 		
 		//! Emitted AFTER a MouseEvent occured
 		/*!
-		 * This signals allows to receive click events within the MapWidget together with the world coordinate.
+		 * This signals allows receiving click events within the MapWidget together with the world coordinate.
 		 * It is emitted on MousePressEvents and MouseReleaseEvents.
 		 * The kind of the event can be obtained by checking the events type.
 		 * @param  evnt the QMouseEvent that occured
diff --git a/src/QMapControl/mapnetwork.cpp b/src/QMapControl/mapnetwork.cpp
index 3f17597..308df96 100644
--- a/src/QMapControl/mapnetwork.cpp
+++ b/src/QMapControl/mapnetwork.cpp
@@ -60,16 +60,16 @@ void MapNetwork::launchRequest()
         return;
     LoadingRequest* R = loadingRequests.dequeue();
 
-    QUrl U;
-    if (!R->host.contains("://")) {
-        U.setUrl("http://" + QString(R->host).append(R->url));
+    QUrl theUrl;
+    if (R->host.contains("://")) {
+        theUrl.setUrl(QString(R->host).append(R->url));
     } else {
-        U.setUrl(QString(R->host).append(R->url));
+        theUrl.setUrl("http://" + QString(R->host).append(R->url));
     }
 
-    qDebug() << "getting: " << U.toString();
+    qDebug() << "getting: " << theUrl.toString();
 
-    launchRequest(U, R);
+    launchRequest(theUrl, R);
 }
 
 void MapNetwork::launchRequest(QUrl url, LoadingRequest* R)
@@ -80,15 +80,15 @@ void MapNetwork::launchRequest(QUrl url, LoadingRequest* R)
     req.setRawHeader("Accept", "image/*");
     req.setRawHeader("User-Agent", USER_AGENT.toLatin1());
 
-    QNetworkReply* rply = m_networkManager->get(req);
-    loadingMap[rply] = R;
+    QNetworkReply* reply = m_networkManager->get(req);
+    loadingMap[reply] = R;
 
     QTimer* timeoutTimer = new QTimer();
     connect(timeoutTimer, SIGNAL(timeout()), this, SLOT(timeout()));
     timeoutTimer->setInterval(M_PREFS->getNetworkTimeout());
     timeoutTimer->setSingleShot(true);
 
-    timeoutMap[timeoutTimer] = rply;
+    timeoutMap[timeoutTimer] = reply;
     timeoutTimer->start();
 }
 
diff --git a/src/QMapControl/tilemapadapter.h b/src/QMapControl/tilemapadapter.h
index aaf5faa..ae49138 100644
--- a/src/QMapControl/tilemapadapter.h
+++ b/src/QMapControl/tilemapadapter.h
@@ -84,7 +84,7 @@ public:
 
     virtual bool isValid(int x, int y, int z) const;
     virtual QString getQuery(int x, int y, int z) const;
-    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return ""; }
+    virtual QString getQuery(const QRectF& , const QRectF& , const QRect& ) const { return QString(); }
     virtual QPixmap getPixmap(const QRectF& /* wgs84Bbox */, const QRectF& /* projBbox */, const QRect& /* size */) const { return QPixmap(); }
 
     virtual QRectF	getBoundingbox() const;
@@ -97,7 +97,7 @@ public:
 
     virtual bool toXML(QXmlStreamWriter& /*stream*/) { return true; }
     virtual void fromXML(QXmlStreamReader& /*xParent*/) {}
-    virtual QString toPropertiesHtml() {return "";}
+    virtual QString toPropertiesHtml() {return QString();}
 
     virtual void setSettings(QSettings* /*aSet*/) {}
 
diff --git a/src/QMapControl/wmsmapadapter.h b/src/QMapControl/wmsmapadapter.h
index 5725872..2a91fe3 100644
--- a/src/QMapControl/wmsmapadapter.h
+++ b/src/QMapControl/wmsmapadapter.h
@@ -107,7 +107,7 @@ public:
     virtual void	zoom_out() {}
 
     virtual bool	isValid(int, int, int) const { return true; }
-    virtual QString getQuery(int, int, int)  const { return ""; }
+    virtual QString getQuery(int, int, int)  const { return QString(); }
     virtual QString getQuery(const QRectF& wgs84Bbox, const QRectF& projBbox, const QRect& size) const ;
     virtual QPixmap getPixmap(const QRectF& /* wgs84Bbox */, const QRectF& /* projBbox */, const QRect& /* size */) const { return QPixmap(); }
 
@@ -127,7 +127,7 @@ public:
 
     virtual bool toXML(QXmlStreamWriter& /*stream*/) { return true; }
     virtual void fromXML(QXmlStreamReader& /*xParent*/) {}
-    virtual QString toPropertiesHtml() {return "";}
+    virtual QString toPropertiesHtml() {return QString();}
 
     virtual void setSettings(QSettings* /*aSet*/) {}
 
diff --git a/src/Render/MapRenderer.cpp b/src/Render/MapRenderer.cpp
index cc62ef1..e7a8d18 100644
--- a/src/Render/MapRenderer.cpp
+++ b/src/Render/MapRenderer.cpp
@@ -211,140 +211,6 @@ MapRenderer::MapRenderer()
     lbllayer = LabelStyleLayer(this);
 }
 
-#if 0
-void MapRenderer::render(
-        QPainter* P,
-        QMap<RenderPriority, QSet <Feature*> > theFeatures,
-        const RendererOptions& options,
-        MapView* aView
-)
-{
-    #ifndef NDEBUG
-        QTime Start(QTime::currentTime());
-    #endif
-
-    theView = aView;
-    theOptions = options;
-
-    QMap<RenderPriority, QSet<Feature*> >::const_iterator itm;
-    QSet<Feature*>::const_iterator it;
-
-    bool bgLayerVisible = TEST_RFLAGS(RendererOptions::BackgroundVisible);
-    bool fgLayerVisible = TEST_RFLAGS(RendererOptions::ForegroundVisible);
-    bool tchpLayerVisible = TEST_RFLAGS(RendererOptions::TouchupVisible);
-    bool lblLayerVisible = TEST_RFLAGS(RendererOptions::NamesVisible);
-
-    Way * R = NULL;
-    Node * Pt = NULL;
-    Relation * RR = NULL;
-
-    QPixmap pix(theView->size());
-    thePainter = new QPainter();
-
-    itm = theFeatures.constBegin();
-    while (itm != theFeatures.constEnd())
-    {
-        pix.fill(Qt::transparent);
-        thePainter->begin(&pix);
-        if (M_PREFS->getUseAntiAlias())
-            thePainter->setRenderHint(QPainter::Antialiasing);
-        int curLayer = (itm.key()).layer();
-        while (itm != theFeatures.constEnd() && (itm.key()).layer() == curLayer)
-        {
-            for (it = itm.value().constBegin(); it != itm.value().constEnd(); ++it)
-            {
-                qreal alpha = (*it)->getAlpha();
-                thePainter->setOpacity(alpha);
-
-                R = NULL;
-                Pt = NULL;
-                RR = NULL;
-
-                if (!(R = CAST_WAY(*it)))
-                    if (!(Pt = CAST_NODE(*it)))
-                        RR = CAST_RELATION(*it);
-
-                if (R) {
-                    // If there is painter at the relation level, don't paint at the way level
-                    bool draw = true;
-                    for (int i=0; i<R->sizeParents(); ++i) {
-                        if (!R->getParent(i)->isDeleted() && R->getParent(i)->hasPainter(PixelPerM))
-                            draw = false;
-                    }
-                    if (!draw)
-                        continue;
-                }
-
-                if (!Pt) {
-                    if (bgLayerVisible)
-                    {
-                        thePainter->save();
-                        if (R && R->area() == 0)
-                            thePainter->setCompositionMode(QPainter::CompositionMode_DestinationOver);
-
-                        if (R)
-                            bglayer.draw(R);
-                        else if (Pt)
-                            bglayer.draw(Pt);
-                        else if (RR)
-                            bglayer.draw(RR);
-
-                        thePainter->restore();
-                    }
-                    if (fgLayerVisible)
-                    {
-                        thePainter->save();
-
-                        if (R)
-                            fglayer.draw(R);
-                        else if (Pt)
-                            fglayer.draw(Pt);
-                        else if (RR)
-                            fglayer.draw(RR);
-
-                        thePainter->restore();
-                    }
-                }
-                if (tchpLayerVisible)
-                {
-                    thePainter->save();
-
-                    if (R)
-                        tchuplayer.draw(R);
-                    else if (Pt)
-                        tchuplayer.draw(Pt);
-                    else if (RR)
-                        tchuplayer.draw(RR);
-
-                    thePainter->restore();
-                }
-                if (lblLayerVisible) {
-                    thePainter->save();
-
-                    if (R)
-                        lbllayer.draw(R);
-                    else if (Pt)
-                        lbllayer.draw(Pt);
-                    else if (RR)
-                        lbllayer.draw(RR);
-
-                    thePainter->restore();
-                }
-
-                (*it)->draw(*thePainter, aView);
-            }
-            ++itm;
-        }
-        thePainter->end();
-        P->drawPixmap(0, 0, pix);
-#ifndef NDEBUG
-    QTime Stop(QTime::currentTime());
-    qDebug() << Start.msecsTo(Stop) << "ms";
-#endif
-    }
-}
-#else
-
 QPoint MapRenderer::toView(Node* aPt) const
 {
     return theTransform.map(aPt->projected()).toPoint();
@@ -360,10 +226,6 @@ void MapRenderer::render(
         const RendererOptions& options
 )
 {
-//    #ifndef NDEBUG
-//        QTime Start(QTime::currentTime());
-//    #endif
-
     theViewport = pViewport;
     theScreen = screen;
     thePixelPerM = pixelPerM;
@@ -385,7 +247,6 @@ void MapRenderer::render(
     theTransform.reset();
     theTransform.scale(ScaleLon, -ScaleLat);
     theTransform.translate(-pViewport.topLeft().x(), -pViewport.topLeft().y());
-//    qDebug() << "render transform: " << theTransform;
 
     theOptions = options;
     theGlobalPainter = M_STYLE->getGlobalPainter();
@@ -531,11 +392,4 @@ void MapRenderer::render(
         }
     }
     thePainter->restore();
-
-//    #ifndef NDEBUG
-//        QTime Stop(QTime::currentTime());
-//        qDebug() << Start.msecsTo(Stop) << "ms";
-//    #endif
 }
-#endif
-
diff --git a/src/Render/NativeRenderDialog.cpp b/src/Render/NativeRenderDialog.cpp
index b741a4f..75ad12a 100644
--- a/src/Render/NativeRenderDialog.cpp
+++ b/src/Render/NativeRenderDialog.cpp
@@ -148,7 +148,7 @@ void NativeRenderDialog::render(QPainter& P, QRect theR, RendererOptions opt)
     mapview->setViewport(boundingBox(), theR);
     mapview->setRenderOptions(opt);
     mapview->invalidate(true, true, false);
-    mapview->drawFeatures(P);
+    mapview->drawFeaturesSync(P);
     if (opt.options & RendererOptions::ScaleVisible)
         mapview->drawScale(P);
     if (opt.options & RendererOptions::LatLonGridVisible)
@@ -171,17 +171,12 @@ void NativeRenderDialog::exportPDF()
     if (s.isNull())
         return;
 
-#if QT_VERSION >= 0x040500
-    QPrinter* prt = preview->printer();
-#else
-    QPrinter* prt = thePrinter;
-#endif
-    prt->setOutputFormat(QPrinter::PdfFormat);
-    prt->setOutputFileName(s);
+    thePrinter->setOutputFormat(QPrinter::PdfFormat);
+    thePrinter->setOutputFileName(s);
 
-    QPainter P(prt);
+    QPainter P(thePrinter);
     P.setRenderHint(QPainter::Antialiasing);
-    QRect theR = prt->pageRect();
+    QRect theR = thePrinter->pageRect();
     theR.moveTo(0, 0);
     RendererOptions opt = options();
     opt.options |= RendererOptions::PrintAllLabels;
@@ -203,11 +198,8 @@ void NativeRenderDialog::exportRaster()
 //    QString s = QFileDialog::getSaveFileName(NULL,tr("Output filename"),"",tr("Image files (*.png *.jpg)"));
     if (s.isNull())
         return;
-#if QT_VERSION >= 0x040500
-    QRect theR = preview->printer()->pageRect();
-#else
+
     QRect theR = thePrinter->pageRect();
-#endif
     theR.moveTo(0, 0);
 
     QPixmap pix(theR.size());
@@ -242,11 +234,7 @@ void NativeRenderDialog::exportSVG()
         return;
 
     QSvgGenerator svgg;
-#if QT_VERSION >= 0x040500
-    QRect theR = preview->printer()->pageRect();
-#else
     QRect theR = thePrinter->pageRect();
-#endif
     theR.moveTo(0, 0);
     svgg.setSize(theR.size());
     svgg.setFileName(s);
diff --git a/src/Sync/DirtyList.cpp b/src/Sync/DirtyList.cpp
index 6c68d76..4ffaeac 100644
--- a/src/Sync/DirtyList.cpp
+++ b/src/Sync/DirtyList.cpp
@@ -21,6 +21,10 @@
 #include <algorithm>
 
 int glbAdded, glbUpdated, glbDeleted;
+int glbNodesAdded, glbNodesUpdated, glbNodesDeleted;
+int glbWaysAdded, glbWaysUpdated, glbWaysDeleted;
+int glbRelationsAdded, glbRelationsUpdated, glbRelationsDeleted;
+
 QString glbChangeSetComment;
 
 QString stripToOSMId(const IFeature::FId& id)
@@ -30,10 +34,10 @@ QString stripToOSMId(const IFeature::FId& id)
 
 QString userName(const Feature* F)
 {
-    QString s(F->tagValue("name",""));
+    QString s(F->tagValue("name", QString()));
     if (!s.isEmpty())
         return " ("+s+")";
-    return "";
+    return QString();
 }
 
 DirtyList::~DirtyList()
@@ -279,6 +283,9 @@ DirtyListDescriber::DirtyListDescriber(Document* aDoc, const DirtyListBuild& aFu
 : DirtyListVisit(aDoc, aFuture, false), Task(0)
 {
     glbAdded = glbUpdated = glbDeleted = 0;
+    glbNodesAdded = glbNodesUpdated = glbNodesDeleted = 0;
+    glbWaysAdded = glbWaysUpdated = glbWaysDeleted = 0;
+    glbRelationsAdded = glbRelationsUpdated = glbRelationsDeleted = 0;
 }
 
 int DirtyListDescriber::tasks() const
@@ -295,25 +302,37 @@ bool DirtyListDescriber::showChanges(QWidget* aParent)
 
     runVisit();
 
-    CoordBox bbox = theDocument->getDirtyOrOriginLayer()->boundingBox();
-    QString bboxComment = QString("BBOX:%1,%2,%3,%4")
-            .arg(QString::number(bbox.bottomLeft().x(), 'f', 2))
-            .arg(QString::number(bbox.bottomLeft().y(), 'f', 2))
-            .arg(QString::number(bbox.topRight().x(), 'f', 2))
-            .arg(QString::number(bbox.topRight().y(), 'f', 2));
-
-    QString statComment = QString("ADD:%1 UPD:%2 DEL:%3").arg(glbAdded).arg(glbUpdated).arg(glbDeleted);
-
-    glbChangeSetComment = bboxComment + " " + statComment;
-    Ui.edChangesetComment->setText(glbChangeSetComment);
-    Ui.edChangesetComment->selectAll();
-
-    bool ok = (dlg->exec() == QDialog::Accepted);
-
-    if (!Ui.edChangesetComment->text().isEmpty())
-        glbChangeSetComment = Ui.edChangesetComment->text();
-    else
-        glbChangeSetComment = "-";
+    Ui.lblNodesAdded->setText(QString::number(glbNodesAdded));
+    Ui.lblNodesUpdated->setText(QString::number(glbNodesUpdated));
+    Ui.lblNodesDeleted->setText(QString::number(glbNodesDeleted));
+    Ui.lblWaysAdded->setText(QString::number(glbWaysAdded));
+    Ui.lblWaysUpdated->setText(QString::number(glbWaysUpdated));
+    Ui.lblWaysDeleted->setText(QString::number(glbWaysDeleted));
+    Ui.lblRelationsAdded->setText(QString::number(glbRelationsAdded));
+    Ui.lblRelationsUpdated->setText(QString::number(glbRelationsUpdated));
+    Ui.lblRelationsDeleted->setText(QString::number(glbRelationsDeleted));
+    Ui.lblAdded->setText(QString::number(glbAdded));
+    Ui.lblUpdated->setText(QString::number(glbUpdated));
+    Ui.lblDeleted->setText(QString::number(glbDeleted));
+
+    //Ui.edChangesetComment->setText(glbChangeSetComment);
+    //Ui.edChangesetComment->selectAll();
+
+    bool ok = false;
+    while (!ok) {
+        if (dlg->exec() == QDialog::Accepted) {
+            /* Dialog was accepted, check for non-empty comment */
+            if (!Ui.edChangesetComment->text().isEmpty()) {
+                glbChangeSetComment = Ui.edChangesetComment->text();
+                ok = true;
+            } else if (QMessageBox::question(NULL,
+                        QApplication::tr("Use empty changeset comment?"),
+                        QApplication::tr("The changeset comment is empty. It's considered a courtesy to your fellow mappers to provide a good comment, so everyone knows what your change does and with what intention.\n"
+                            "Do you still wish to commit empty changeset comment?"), QMessageBox::Yes, QMessageBox::No )
+                    == QMessageBox::Yes
+               ) ok = true;
+        } else break; /* Dialog was cancelled */
+    }
 
     Task = Ui.ChangesList->count();
     SAFE_DELETE(dlg)
@@ -326,6 +345,7 @@ bool DirtyListDescriber::addRoad(Way* R)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD road %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbAdded;
+    ++glbWaysAdded;
     return false;
 }
 
@@ -334,6 +354,7 @@ bool DirtyListDescriber::addPoint(Node* Pt)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
     ++glbAdded;
+    ++glbNodesAdded;
     return false;
 }
 
@@ -342,6 +363,7 @@ bool DirtyListDescriber::addRelation(Relation* R)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD relation %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbAdded;
+    ++glbRelationsAdded;
     return false;
 }
 
@@ -350,6 +372,7 @@ bool DirtyListDescriber::updatePoint(Node* Pt)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
     ++glbUpdated;
+    ++glbNodesUpdated;
     return false;
 }
 
@@ -358,6 +381,7 @@ bool DirtyListDescriber::updateRelation(Relation* R)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE relation %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbUpdated;
+    ++glbRelationsUpdated;
     return false;
 }
 
@@ -366,6 +390,7 @@ bool DirtyListDescriber::updateRoad(Way* R)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE road %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbUpdated;
+    ++glbWaysUpdated;
     return false;
 }
 
@@ -374,6 +399,7 @@ bool DirtyListDescriber::erasePoint(Node* Pt)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
     ++glbDeleted;
+    ++glbNodesDeleted;
     return false;
 }
 
@@ -382,6 +408,7 @@ bool DirtyListDescriber::eraseRoad(Way* R)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE road %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbDeleted;
+    ++glbWaysDeleted;
     return false;
 }
 
@@ -390,6 +417,7 @@ bool DirtyListDescriber::eraseRelation(Relation* R)
     QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE relation %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbDeleted;
+    ++glbRelationsDeleted;
     return false;
 }
 
@@ -482,7 +510,7 @@ bool DirtyListExecutor::executeChanges(QWidget* aParent)
 
 bool DirtyListExecutor::start()
 {
-    ChangeSetId = "";
+    ChangeSetId.clear();
     Progress->setValue(++Done);
 
     qDebug() << QString("OPEN changeset");
@@ -521,7 +549,7 @@ bool DirtyListExecutor::stop()
     QString DataIn, DataOut;
     if (sendRequest("PUT",URL,DataIn,DataOut))
     {
-        ChangeSetId = "";
+        ChangeSetId.clear();
         return true;
     }
 
diff --git a/src/Sync/DirtyListExecutorOSC.cpp b/src/Sync/DirtyListExecutorOSC.cpp
index a261c2a..8007c43 100644
--- a/src/Sync/DirtyListExecutorOSC.cpp
+++ b/src/Sync/DirtyListExecutorOSC.cpp
@@ -177,7 +177,7 @@ bool DirtyListExecutorOSC::executeChanges(QWidget* aParent)
 
 bool DirtyListExecutorOSC::start()
 {
-    ChangeSetId = "";
+    ChangeSetId.clear();
     Progress->setValue(++Done);
     qDebug() << QString("OPEN changeset");
 
@@ -304,7 +304,9 @@ bool DirtyListExecutorOSC::stop()
     URL = theDownloader->getURLToCloseChangeSet(ChangeSetId);
     QUrl theUrl(Web+URL);
     theDownloader->setAnimator(NULL, NULL, NULL, false);
-    theDownloader->request("PUT",theUrl,DataIn, true);
+    if (!theDownloader->request("PUT",theUrl,DataIn)) {
+        QMessageBox::warning(NULL, tr("Changeset could not be closed."), tr("An unknown error has occurred. It might already be closed, or will be closed automatically. If you want to be sure, please, check manually on the osm.org website."));
+    }
 
     return true;
 }
diff --git a/src/Sync/DownloadOSM.cpp b/src/Sync/DownloadOSM.cpp
index 4231e7e..94c7f16 100644
--- a/src/Sync/DownloadOSM.cpp
+++ b/src/Sync/DownloadOSM.cpp
@@ -48,8 +48,7 @@ void Downloader::animate()
 
 void Downloader::setAnimator(QProgressDialog *anAnimator, QLabel* anAnimatorLabel, QProgressBar* anAnimatorBar, bool anAnimate)
 {
-    if (AnimationTimer)
-        delete AnimationTimer;
+    delete AnimationTimer;
 
     AnimatorLabel = anAnimatorLabel;
     AnimatorBar = anAnimatorBar;
@@ -77,10 +76,10 @@ void Downloader::on_Cancel_clicked()
 #include "QTextBrowser"
 
 bool Downloader::go(const QUrl& url) {
-    return request("GET", url, QString(), false);
+    return request("GET", url, QString());
 }
 
-bool Downloader::request(const QString& theMethod, const QUrl& url, const QString& theData, bool FireForget) {
+bool Downloader::request(const QString& theMethod, const QUrl& url, const QString& theData) {
     if (Error) return false;
 
     qDebug() << "Downloader::request: " << url;
@@ -100,9 +99,6 @@ bool Downloader::request(const QString& theMethod, const QUrl& url, const QStrin
         connect(currentReply,SIGNAL(downloadProgress(qint64, qint64)), this,SLOT(progress(qint64, qint64)));
     }
 
-    if (FireForget)
-        return true;
-
     if (Loop.exec() == QDialog::Rejected)
         return false;
 
@@ -115,7 +111,7 @@ bool Downloader::request(const QString& theMethod, const QUrl& url, const QStrin
         LocationText = redir.toString();
         if (!LocationText.isEmpty()) {
             QUrl newUrl(LocationText);
-            return request(theMethod, newUrl, theData, FireForget);
+            return request(theMethod, newUrl, theData);
         }
     }
 
@@ -354,10 +350,30 @@ bool downloadOSM(QWidget* aParent, const QString& aWeb, const QString& aUser, co
     }
     Downloader Rcv(aUser, aPassword);
     QString URL = Rcv.getURLToMap();
-    URL = URL.arg(aBox.bottomLeft().x(), 0, 'f').arg(aBox.bottomLeft().y(), 0, 'f').arg(aBox.topRight().x(), 0, 'f').arg(aBox.topRight().y(), 0, 'f');
 
-    QUrl theUrl(aWeb+URL);
-    return downloadOSM(aParent, theUrl, aUser, aPassword, theDocument, theLayer);
+    if ((fabs(aBox.bottomLeft().x()) < 180.0 && fabs(aBox.topRight().x()) > 180.0) 
+     || (fabs(aBox.bottomLeft().x()) > 180.0 && fabs(aBox.topRight().x()) < 180.0)) {
+        /* Check for +-180 meridian, and split query in two if necessary */
+        int sign = (aBox.bottomLeft().x() > 0) ? 1 : -1;
+        CoordBox q1 = aBox, q2 = aBox;
+        if (aBox.bottomLeft().x() > 0) {
+            q1.setRight(180*sign);
+            q2.setLeft(-180*sign);
+            q2.setRight(q2.right()-360);
+        } else {
+            q1.setLeft(180*sign);
+            q2.setRight(-180*sign);
+            q2.setLeft(q2.left()+360);
+        }
+        return downloadOSM(aParent, aWeb, aUser, aPassword, q1, theDocument, theLayer)
+            && downloadOSM(aParent, aWeb, aUser, aPassword, q2, theDocument, theLayer);
+
+    } else {
+        /* Normal code path */
+        URL = URL.arg(aBox.bottomLeft().x(), 0, 'f').arg(aBox.bottomLeft().y(), 0, 'f').arg(aBox.topRight().x(), 0, 'f').arg(aBox.topRight().y(), 0, 'f');
+        QUrl theUrl(aWeb+URL);
+        return downloadOSM(aParent, theUrl, aUser, aPassword, theDocument, theLayer);
+    }
 }
 
 bool downloadTracksFromOSM(QWidget* Main, const QString& aWeb, const QString& aUser, const QString& aPassword, const CoordBox& aBox , Document* theDocument)
@@ -557,79 +573,6 @@ bool downloadMapdust(MainWindow* Main, const CoordBox& aBox, Document* theDocume
     return OK;
 }
 
-bool downloadOpenstreetbugs(MainWindow* Main, const CoordBox& aBox, Document* theDocument, SpecialLayer* theLayer)
-{
-    QUrl osbUrl;
-
-    osbUrl.setUrl(M_PREFS->getOpenStreetBugsUrl());
-    osbUrl.setPath(osbUrl.path() + "getGPX");
-
-    if (Main)
-        Main->view()->setUpdatesEnabled(false);
-
-    Downloader theDownloader("", "");
-
-    QList<TrackLayer*> theTracklayers;
-    SpecialLayer* trackLayer = theLayer;
-    if (!trackLayer) {
-        SpecialLayer* trackLayer = new SpecialLayer(QApplication::translate("Downloader","OpenStreetBugs"),Layer::OsmBugsLayer);
-        trackLayer->setUploadable(false);
-        theDocument->add(trackLayer);
-    }
-    theTracklayers << trackLayer;
-
-    IProgressWindow* aProgressWindow = dynamic_cast<IProgressWindow*>(Main);
-    if (!aProgressWindow)
-        return false;
-
-    QProgressDialog* dlg = aProgressWindow->getProgressDialog();
-    dlg->setWindowTitle(QApplication::translate("Downloader","Parsing..."));
-
-    QProgressBar* Bar = aProgressWindow->getProgressBar();
-    Bar->setTextVisible(false);
-    Bar->setMaximum(11);
-
-    QLabel* Lbl = aProgressWindow->getProgressLabel();
-    Lbl->setText(QApplication::translate("Downloader","Parsing XML"));
-
-    if (dlg)
-        dlg->show();
-
-    theDownloader.setAnimator(dlg,Lbl,Bar,true);
-    Lbl->setText(QApplication::translate("Downloader","Downloading points"));
-
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-    QUrlQuery theQuery(osbUrl);
-#define theQuery theQuery
-#else
-#define theQuery osbUrl
-#endif
-    theQuery.addQueryItem("t", COORD2STRING(aBox.topRight().y()));
-    theQuery.addQueryItem("l", COORD2STRING(aBox.bottomLeft().x()));
-    theQuery.addQueryItem("b", COORD2STRING(aBox.bottomLeft().y()));
-    theQuery.addQueryItem("r", COORD2STRING(aBox.topRight().x()));
-    theQuery.addQueryItem("open", "yes");
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-    osbUrl.setQuery(theQuery);
-#endif
-#undef theQuery
-
-    if (!theDownloader.go(osbUrl))
-        return false;
-    if (theDownloader.resultCode() != 200)
-        return false;
-    QByteArray Ar(theDownloader.content());
-    bool OK = importGPX(Main, Ar, theDocument, theTracklayers, true);
-
-    if (Main)
-        Main->view()->setUpdatesEnabled(true);
-    if (OK) {
-        if (Main)
-            Main->invalidateView();
-    }
-    return OK;
-}
-
 bool downloadMoreOSM(MainWindow* Main, const CoordBox& aBox , Document* theDocument)
 {
     Layer* theLayer;
@@ -747,12 +690,12 @@ bool downloadOSM(MainWindow* Main, const CoordBox& aBox , Document* theDocument)
             {
                 directAPI = true;
                 directUrl = M_PREFS->getXapiUrl();
-                if (!directUrl.endsWith("/")) directUrl += "/";
+                //if (!directUrl.endsWith("/")) directUrl += "/";
                 directUrl += ui.edXapiUrl->text();
             }
             else if (ui.FromMap->isChecked())
             {
-                QRectF R(SlippyMap->viewArea());
+                QRectF R(SlippyMap->selectedArea());
                 Clip = CoordBox(Coord(R.x(), R.y()), Coord(R.x()+R.width(), R.y()+R.height()));
             }
             if (retry) continue;
diff --git a/src/Sync/DownloadOSM.h b/src/Sync/DownloadOSM.h
index 81f297f..70a8081 100644
--- a/src/Sync/DownloadOSM.h
+++ b/src/Sync/DownloadOSM.h
@@ -30,7 +30,7 @@ class Downloader : public QObject
     public:
         Downloader(const QString& aUser, const QString& aPwd);
 
-        bool request(const QString& theMethod, const QUrl& URL, const QString& Out, bool FireForget=false);
+        bool request(const QString& theMethod, const QUrl& URL, const QString& Out);
         bool go(const QUrl& url);
         QByteArray& content();
         int resultCode();
@@ -80,7 +80,6 @@ bool downloadMoreOSM(MainWindow* Main, const CoordBox& aBox , Document* theDocum
 bool downloadFeatures(MainWindow* Main, const QList<Feature*>& aDownloadList , Document* theDocument);
 bool downloadFeature(MainWindow* Main, const IFeature::FId& id, Document* theDocument, Layer* theLayer=NULL);
 bool downloadFeatures(MainWindow* Main, const QList<IFeature::FId>& aDownloadList, Document* theDocument, Layer* theLayer=NULL);
-bool downloadOpenstreetbugs(MainWindow* Main, const CoordBox& aBox, Document* theDocument, SpecialLayer* theLayer=NULL);
 bool downloadMapdust(MainWindow* Main, const CoordBox& aBox, Document* theDocument, SpecialLayer* theLayer=NULL);
 
 bool checkForConflicts(Document* theDocument);
diff --git a/src/Sync/SyncListDialog.ui b/src/Sync/SyncListDialog.ui
index b41a755..96972ba 100644
--- a/src/Sync/SyncListDialog.ui
+++ b/src/Sync/SyncListDialog.ui
@@ -1,58 +1,261 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SyncListDialog</class>
- <widget class="QDialog" name="SyncListDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SyncListDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>597</width>
+    <height>412</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Upload to Openstreetmap</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>4</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>4</number>
    </property>
    <item>
-    <widget class="QLabel" name="lblChangesetComment" >
-     <property name="text" >
-      <string>Please specify a comment for this changeset.</string>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="lblChangesetComment">
+       <property name="text">
+        <string>Comment</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="edChangesetComment"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <pointsize>8</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string>A good comment should concisely and adequately describe the edit.</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLineEdit" name="edChangesetComment" />
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Please review carefully the changes sent to OSM</string>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>The following changes will be commited:</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QListWidget" name="ChangesList" />
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="2" column="1">
+      <widget class="QLabel" name="lblNodesAdded">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Added</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Updated</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Deleted</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLabel" name="label_8">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Ways</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="label_7">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Nodes</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLabel" name="label_9">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Relations</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QLabel" name="lblWaysAdded">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="3">
+      <widget class="QLabel" name="lblRelationsAdded">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLabel" name="lblNodesUpdated">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QLabel" name="lblWaysUpdated">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="3">
+      <widget class="QLabel" name="lblRelationsUpdated">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLabel" name="lblNodesDeleted">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="2">
+      <widget class="QLabel" name="lblWaysDeleted">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="3">
+      <widget class="QLabel" name="lblRelationsDeleted">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="QLabel" name="label_10">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Sum</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="4">
+      <widget class="QLabel" name="lblAdded">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="4">
+      <widget class="QLabel" name="lblUpdated">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="4">
+      <widget class="QLabel" name="lblDeleted">
+       <property name="text">
+        <string notr="true">-</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QListWidget" name="ChangesList"/>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>131</width>
          <height>31</height>
@@ -61,15 +264,15 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="okButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
         <string>OK</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
         <string>Cancel</string>
        </property>
       </widget>
@@ -86,11 +289,11 @@
    <receiver>SyncListDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>278</x>
      <y>253</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>96</x>
      <y>254</y>
     </hint>
@@ -102,11 +305,11 @@
    <receiver>SyncListDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>369</x>
      <y>253</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>179</x>
      <y>282</y>
     </hint>
diff --git a/src/TagTemplate/TagTemplate.cpp b/src/TagTemplate/TagTemplate.cpp
index de7b0dd..20a427f 100644
--- a/src/TagTemplate/TagTemplate.cpp
+++ b/src/TagTemplate/TagTemplate.cpp
@@ -34,8 +34,7 @@ TagTemplateWidget::~TagTemplateWidget()
 {
     // No need to delete; will be destroyed automatically by parent + crash if no active widget.
     // delete theMainWidget;
-    for (int i=0; i<theValues.size(); ++i)
-        delete theValues[i];
+    qDeleteAll(theValues);
     delete theSelector;
 }
 
@@ -46,23 +45,24 @@ TagTemplateWidget* TagTemplateWidget::fromXml(const QDomElement& e)
     }
 
     TagTemplateWidget* aTW = NULL;
-    if (e.attribute("type") == "combo") {
+    const QString tp = e.attribute("type");
+    if (tp == "combo") {
         aTW = TagTemplateWidgetCombo::fromXml(e);
     } else
-    if (e.attribute("type") == "yesno") {
+    if (tp == "yesno") {
         aTW = TagTemplateWidgetYesno::fromXml(e);
     } else
-    if (e.attribute("type") == "constant") {
+    if (tp == "constant") {
         aTW = TagTemplateWidgetConstant::fromXml(e);
     } else
-    if (e.attribute("type") == "edit") {
+    if (tp == "edit") {
         aTW = TagTemplateWidgetEdit::fromXml(e);
     } else
         Q_ASSERT(false);
 
     if (aTW) {
         aTW->theId = e.attribute("id");
-        aTW->theType = e.attribute("type");
+        aTW->theType = tp;
         aTW->theTag = e.attribute("tag");
     }
 
@@ -79,7 +79,7 @@ void TagTemplateWidget::parseCommonElements(const QDomElement& e)
     } else
     if (e.tagName() == "selector") {
         theSelector = TagSelector::parse(e.attribute("expr"));
-    }
+    } else
     if (e.tagName() == "value") {
         TagTemplateWidgetValue* aTCV = TagTemplateWidgetValue::fromXml(e);
         if (aTCV)
@@ -475,7 +475,7 @@ QWidget* TagTemplateWidgetConstant::getWidget(const Feature* F, const MapView* V
         else
             aLabel->setText(theDescription);
     } else
-        aValue->setText(QString("<b>%1</b>").arg(F->tagValue(theTag, "")));
+        aValue->setText(QString("<b>%1</b>").arg(F->tagValue(theTag, QString())));
 
     theMainWidget = aValue;
     theLabelWidget = aLabel;
@@ -486,7 +486,7 @@ QWidget* TagTemplateWidgetConstant::getWidget(const Feature* F, const MapView* V
 void TagTemplateWidgetConstant::apply(const Feature* F)
 {
     if (!theValues.count()) {
-        ((QLabel*)theMainWidget)->setText(QString("<b>%1</b>").arg(F->tagValue(theTag, "")));
+        ((QLabel*)theMainWidget)->setText(QString("<b>%1</b>").arg(F->tagValue(theTag, QString())));
         return;
     }
     bool Regexp = false;
@@ -512,7 +512,7 @@ void TagTemplateWidgetConstant::apply(const Feature* F)
             emit tagChanged(theTag, newVal);
         }
     } else
-        ((QLabel*)theMainWidget)->setText(QString("<b>%1</b>").arg(F->tagValue(theTag, "")));
+        ((QLabel*)theMainWidget)->setText(QString("<b>%1</b>").arg(F->tagValue(theTag, QString())));
 }
 
 TagTemplateWidgetConstant* TagTemplateWidgetConstant::fromXml(const QDomElement& e)
@@ -700,7 +700,7 @@ TagSelectorMatchResult TagTemplate::matchesTag(const Feature* F, const MapView*
         {
             if (const Relation* Parent = dynamic_cast<const Relation*>(R->getParent(i)))
                 if (!Parent->isDeleted())
-                    if (Parent->tagValue("type","") == "multipolygon")
+                    if (Parent->tagValue("type",QString()) == "multipolygon")
                         return TagSelect_NoMatch;
         }
     }
@@ -709,7 +709,7 @@ TagSelectorMatchResult TagTemplate::matchesTag(const Feature* F, const MapView*
     // Special casing for multipolygon relations
     if (const Relation* R = dynamic_cast<const Relation*>(F))
     {
-        if (R->tagValue("type","") == "multipolygon") {
+        if (R->tagValue("type",QString()) == "multipolygon") {
             for (int i=0; i<R->size(); ++i)
                 if (!R->get(i)->isDeleted())
                     if ((res = theSelector->matches(R->get(i),V->pixelPerM())))
@@ -857,10 +857,8 @@ TagTemplates::TagTemplates()
 
 TagTemplates::~TagTemplates()
 {
-    for (int i=0; i< widgets.size(); ++i)
-        delete widgets[i];
-    for (int i=0; i< items.size(); ++i)
-        delete items[i];
+    qDeleteAll(widgets);
+    qDeleteAll(items);
 }
 
 QWidget* TagTemplates::getWidget(const Feature* F, const MapView* V)
diff --git a/src/Tools/QFatFs/QFat.cpp b/src/Tools/QFatFs/QFat.cpp
index 47fe4e7..3f17280 100644
--- a/src/Tools/QFatFs/QFat.cpp
+++ b/src/Tools/QFatFs/QFat.cpp
@@ -288,7 +288,7 @@ FatError QFat::setCurrentTocs(const QString &path)
         m_curTocsPath = path;
         return FatNoError;
     } else {
-        m_curTocsPath = "";
+        m_curTocsPath.clear();
         return FatDirNotFound;
     }
 }
diff --git a/src/Utils/EditCompleterDelegate.cpp b/src/Utils/EditCompleterDelegate.cpp
index b6dd43f..01799df 100644
--- a/src/Utils/EditCompleterDelegate.cpp
+++ b/src/Utils/EditCompleterDelegate.cpp
@@ -109,7 +109,7 @@ void EditCompleterDelegate::setModelData(QWidget* editor, QAbstractItemModel* mo
             newVal = edit->text();
 
     if (newVal == index.model()->data(index).toString()) return;
-    if (!newVal.isEmpty())
+    if (!newVal.isEmpty() || index.column() == 1)
         model->setData(index, newVal);
 }
 
diff --git a/src/Utils/OsmLink.cpp b/src/Utils/OsmLink.cpp
index df961b6..dfad6c3 100644
--- a/src/Utils/OsmLink.cpp
+++ b/src/Utils/OsmLink.cpp
@@ -107,6 +107,47 @@ QString OsmLink::parseUrl(QUrl theUrl)
         qreal spanLon = spn[1].toDouble(&parseOk);                  PARSE_ERROR(spn[1]);
 
         setMinMax(lat-spanLat, lon-spanLon/2, lat+spanLat, lon+spanLon/2);
+    } else if (theUrl.host().contains("mapy.cz")) {
+
+        qreal zoom = theQuery.queryItemValue("z").toInt(&parseOk);   ARG_VALID(zoom);
+        qreal lat = theQuery.queryItemValue("y").toDouble(&parseOk); ARG_VALID(lat);
+        qreal lon = theQuery.queryItemValue("x").toDouble(&parseOk); ARG_VALID(lon);
+
+        setLatLonZoom(lat, lon, zoom);
+    } else if (theUrl.toString().contains("/#map=")) {
+        // http://www.openstreetmap.org/#map=<zoom>/<lat>/<lon>
+        QRegExp rx("/#map=([0-9]+)/([0-9.]+)/([0-9.]+)$");
+        if (rx.indexIn(theUrl.toString()) >= 0) {
+            qreal zoom = rx.cap(1).toUInt(&parseOk); PARSE_ERROR(rx.cap(1));
+            qreal lat = rx.cap(2).toDouble(&parseOk); PARSE_ERROR(rx.cap(2));
+            qreal lon = rx.cap(3).toDouble(&parseOk); PARSE_ERROR(rx.cap(3));
+
+            setLatLonZoom(lat, lon, zoom);
+      }
+    } else if (theUrl.toString().contains("/maps/@")) {
+        // https://www.google.de/maps/@<lat>,<lon>,<zoom>z
+        QRegExp rx("/maps/@([0-9.]+),([0-9.]+),([0-9.]+)z$");
+        if (rx.indexIn(theUrl.toString()) >= 0) {
+            qreal lat = rx.cap(1).toDouble(&parseOk); PARSE_ERROR(rx.cap(1));
+            qreal lon = rx.cap(2).toDouble(&parseOk); PARSE_ERROR(rx.cap(2));
+            qreal zoom = rx.cap(3).toDouble(&parseOk); PARSE_ERROR(rx.cap(3));
+
+            setLatLonZoom(lat, lon, zoom);
+        }
+    } else if (theUrl.toString().startsWith("geo:")) {
+        // geo:<lat>,<lon>?z=<zoom>
+        QRegExp rx("^geo:([0-9.]+),([0-9.]+)");
+        if (rx.indexIn(theUrl.toString()) >= 0) {
+            qreal lat = rx.cap(1).toDouble(&parseOk); PARSE_ERROR(rx.cap(1));
+            qreal lon = rx.cap(2).toDouble(&parseOk); PARSE_ERROR(rx.cap(2));
+            qreal zoom = 16; // default value
+
+            rx.setPattern("\\?z=([0-9]+)$");
+            if (rx.indexIn(theUrl.toString()) >= 0)
+                zoom = rx.cap(1).toUInt(&parseOk); PARSE_ERROR(rx.cap(1));
+
+            setLatLonZoom(lat, lon, zoom);
+        }
     }
 #undef theQuery
     return QString("Unrecognised URL: %1").arg(theUrl.toString());
diff --git a/src/Utils/SlippyMapWidget.cpp b/src/Utils/SlippyMapWidget.cpp
index ebf4716..b34edfa 100644
--- a/src/Utils/SlippyMapWidget.cpp
+++ b/src/Utils/SlippyMapWidget.cpp
@@ -13,7 +13,7 @@
 
 #define TILESIZE 256
 #define MINZOOMLEVEL 0
-#define MAXZOOMLEVEL 17
+#define MAXZOOMLEVEL 19
 
 
 /* SLIPPYMAPWIDGET */
@@ -22,7 +22,7 @@ class SlippyMapWidgetPrivate
 {
     public:
         SlippyMapWidgetPrivate(SlippyMapWidget* w)
-            : theWidget(w), InDrag(false)
+            : theWidget(w), InDrag(false), InSelection(false)
         {
             Sets = M_PREFS->getQSettings();
             Sets->beginGroup("SlippyMapWidget");
@@ -50,6 +50,13 @@ class SlippyMapWidgetPrivate
         int Zoom, VpZoom;
         qreal Lat,Lon, VpLat, VpLon;
         QPoint PreviousDrag;
+        /* Used only during selection */
+        bool InSelection;
+        QPoint SelectionStart, SelectionEnd;
+
+        /* Current selection in coordinates */
+        QRectF CurrentSelectionCoord;
+
         bool InDrag;
         QSettings* Sets;
 };
@@ -80,8 +87,6 @@ SlippyMapWidget::SlippyMapWidget(QWidget* aParent)
 {
     p = new SlippyMapWidgetPrivate(this);
     theSlippyCache->setMap(p);
-    setContextMenuPolicy (Qt::CustomContextMenu);
-    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(on_customContextMenuRequested(const QPoint &)));
     resize(500,400);
 }
 
@@ -114,21 +119,22 @@ static int lat2tile(qreal lat, int z)
     return (int)(floor((1.0 - log( tan(lat * M_PI/180.0) + 1.0 / cos(lat * M_PI/180.0)) / M_PI) / 2.0 * pow(2.0, z)));
 }
 
-
-QRectF SlippyMapWidget::viewArea() const
+static qreal long2tileF(qreal lon, int z)
 {
-    qreal X1 = p->Lat - (width()/2.0)/TILESIZE;
-    qreal Y1 = p->Lon - (height()/2.0)/TILESIZE;
-    qreal X2 = p->Lat + (width()/2.0)/TILESIZE;
-    qreal Y2 = p->Lon + (height()/2.0)/TILESIZE;
+    return (lon + 180.0) / 360.0 * pow(2.0, z);
+}
 
-    qreal Lon1 = tile2lon(X1, p->Zoom);
-    qreal Lat1 = tile2lat(Y1, p->Zoom);
+static qreal lat2tileF(qreal lat, int z)
+{
+    return (1.0 - log( tan(lat * M_PI/180.0) + 1.0 / cos(lat * M_PI/180.0)) / M_PI) / 2.0 * pow(2.0, z);
+}
 
-    qreal Lon2 = tile2lon(X2, p->Zoom);
-    qreal Lat2 = tile2lat(Y2, p->Zoom);
 
-    return QRectF(Lon1, Lat2, Lon2-Lon1, Lat1-Lat2);
+QRectF SlippyMapWidget::selectedArea()
+{
+    if (p->CurrentSelectionCoord.isNull())
+        makeSelection(QRect(0,0,width(),height()));
+    return p->CurrentSelectionCoord;
 }
 
 void SlippyMapWidget::setViewportArea(QRectF theRect)
@@ -149,20 +155,22 @@ void SlippyMapWidget::paintEvent(QPaintEvent*)
 {
     QPainter Painter(this);
     Painter.fillRect(QRect(0,0,width(),height()),QColor(255,255,255));
-    int LatRect = int(floor(p->Lat));
-    int LatPixel = int(-(p->Lat - LatRect ) * TILESIZE + width()/2);
     int LonRect = int(floor(p->Lon));
-    int LonPixel = int(-(p->Lon - LonRect ) * TILESIZE + height()/2);
+    int LonPixel = int(-(p->Lon - LonRect ) * TILESIZE + width()/2);
+    int LatRect = int(floor(p->Lat));
+    int LatPixel = int(-(p->Lat - LatRect ) * TILESIZE + height()/2);
+
     while (LatPixel > 0)
         LatPixel -=TILESIZE, --LatRect;
     while (LonPixel > 0)
         LonPixel -= TILESIZE, --LonRect;
-    for (int x=LatPixel; x<width(); x += TILESIZE)
-        for (int y=LonPixel; y<height(); y+= TILESIZE)
+
+    for (int x=LonPixel; x<width(); x += TILESIZE)
+        for (int y=LatPixel; y<height(); y+= TILESIZE)
         {
-            int ThisLatRect = LatRect + (x-LatPixel)/TILESIZE;
-            int ThisLonRect = LonRect + (y-LonPixel)/TILESIZE;
-            QPixmap* img = p->getImage(ThisLatRect,ThisLonRect);
+            int ThisLonRect = LonRect + (x-LonPixel)/TILESIZE;
+            int ThisLatRect = LatRect + (y-LatPixel)/TILESIZE;
+            QPixmap* img = p->getImage(ThisLonRect,ThisLatRect);
             if (img)
                 Painter.drawPixmap(x,y,*img);
             delete img;
@@ -183,6 +191,16 @@ void SlippyMapWidget::paintEvent(QPaintEvent*)
     Painter.setPen(QPen(Qt::black, 3));
     Painter.setBrush(Qt::NoBrush);
     Painter.drawText(QPoint(width()-21,(height()/2)+10), "V");
+
+    if (p->InSelection) {
+        Painter.setPen(QPen(Qt::blue, 1, Qt::DashLine));
+        Painter.drawRect(QRect(p->SelectionStart, p->SelectionEnd));
+    } else if (!p->CurrentSelectionCoord.isNull()) {
+        Painter.setPen(QPen(Qt::blue, 1));
+        QPoint topLeft     = coord2relative(p->CurrentSelectionCoord.topLeft());
+        QPoint bottomRight = coord2relative(p->CurrentSelectionCoord.bottomRight());
+        Painter.drawRect(QRect(topLeft, bottomRight));
+    }
 }
 
 void SlippyMapWidget::ZoomTo(const QPoint & NewCenter, int NewZoom)
@@ -197,12 +215,24 @@ void SlippyMapWidget::ZoomTo(const QPoint & NewCenter, int NewZoom)
     qreal dx = (NewCenter.x()-width()/2)/(TILESIZE*1.0);
     qreal dy = (NewCenter.y()-height()/2)/(TILESIZE*1.0);
 
-    p->Lat = (p->Lat + dx) * (1 << NewZoom) / (1 << p->Zoom) - dx;
-    p->Lon = (p->Lon + dy) * (1 << NewZoom) / (1 << p->Zoom) - dy;
+    p->Lon = (p->Lon + dx) * (1 << NewZoom) / (1 << p->Zoom) - dx;
+    p->Lat = (p->Lat + dy) * (1 << NewZoom) / (1 << p->Zoom) - dy;
     p->Zoom = NewZoom;
+    normalizeCoordinates();
     update();
 }
 
+/* The Lat and Lon coordinates are in fact tile coordinates. The valid range for
+ * world is 0 to 2^zoom-1. Make sure it's so!
+ */
+void SlippyMapWidget::normalizeCoordinates(void) {
+    unsigned limit = (1 << p->Zoom);
+    if (p->Lon < 0) p->Lon = 0;
+    if (p->Lat < 0) p->Lat = 0;
+    if (p->Lon > limit) p->Lon = limit;
+    if (p->Lat > limit) p->Lat = limit;
+}
+
 void SlippyMapWidget::wheelEvent(QWheelEvent* ev)
 {
     int NewZoom = ev->delta()/120 + p->Zoom;
@@ -212,16 +242,9 @@ void SlippyMapWidget::wheelEvent(QWheelEvent* ev)
 
 void SlippyMapWidget::mousePressEvent(QMouseEvent* ev)
 {
-    if (ev->button() == Qt::MidButton)
-    {
-        ZoomTo(ev->pos(), p->Zoom + 1);
-    }
-//	else if (ev->button() == Qt::RightButton)
-//	{
-//		ZoomTo(ev->pos(), p->Zoom - 1);
-//	}
-    else
-    {
+    if (ev->button() == Qt::MidButton) {
+        on_resetViewAction_triggered(true);
+    } else if (ev->button() == Qt::LeftButton) {
         if (ev->pos().x() > width()-20)
         {
             if (ev->pos().y() < 20)
@@ -238,53 +261,116 @@ void SlippyMapWidget::mousePressEvent(QMouseEvent* ev)
             }
             else if ((ev->pos().y() > (height()/2)-20) && (ev->pos().y() < (height()/2)))
             {
-                p->Lat = p->VpLon;
-                p->Lon = p->VpLat;
+                p->Lon = p->VpLon;
+                p->Lat = p->VpLat;
                 p->Zoom = p->VpZoom;
+                normalizeCoordinates();
                 update();
                 emit redraw();
                 return;
             }
         }
+
+        /* No special place, start selection */
+        p->InSelection = true;
+        p->SelectionStart = p->SelectionEnd = ev->pos();
+        qDebug() << "Enter selection";
+    } else {
+        /* RightButton, start drag */
         p->PreviousDrag = ev->pos();
+        p->InDrag = true;
     }
     emit redraw();
 }
 
+/* TODO: relative2coord could be split off this */
+void SlippyMapWidget::makeSelection(const QRect& relative) {
+    /* Compute viewport boundingbox */
+    qreal X1 = p->Lon - (width()/2.0)/TILESIZE;
+    qreal Y1 = p->Lat - (height()/2.0)/TILESIZE;
+    qreal X2 = p->Lon + (width()/2.0)/TILESIZE;
+    qreal Y2 = p->Lat + (height()/2.0)/TILESIZE;
+
+    /* Actual difference per pixel */
+    qreal xpixel = (X2-X1)/width();
+    qreal ypixel = (Y2-Y1)/height();
+
+    /* Shift the border according to relative */
+    X1 += xpixel * relative.topLeft().x();
+    Y1 += ypixel * relative.topLeft().y();
+    X2 -= xpixel * (width() - relative.bottomRight().x());
+    Y2 -= ypixel * (height() - relative.bottomRight().y());
+
+    qreal Lon1 = tile2lon(X1, p->Zoom);
+    qreal Lat1 = tile2lat(Y1, p->Zoom);
+
+    qreal Lon2 = tile2lon(X2, p->Zoom);
+    qreal Lat2 = tile2lat(Y2, p->Zoom);
+
+    /* Save the selection */
+    p->CurrentSelectionCoord =  QRectF(Lon1, Lat2, Lon2-Lon1, Lat1-Lat2);
+
+    qDebug() << "Selection rectangle: " << p->CurrentSelectionCoord;
+}
+
+/* Convert absolute coordinates to relative (to the widget) */
+QPoint SlippyMapWidget::coord2relative(const QPointF& coord) const {
+    /* Convert into local coordinate */
+    qreal X = long2tileF(coord.x(), p->Zoom);
+    qreal Y = lat2tileF(coord.y(), p->Zoom);
+
+    /* p->Lon and p->Lat are the center, but in the same units as X and Y. */
+    X -= p->Lon;
+    Y -= p->Lat;
+
+    /* Now, the p->Lon and p->Lat is equal to width()/2 and height()/2, and X
+     * and Y are the distance in multiples of TILESIZE */
+    QPoint pt(X*TILESIZE, Y*TILESIZE);
+
+    /* Finally shift it relative to topLeft */
+    return pt+QPoint(width()/2, height()/2);
+}
+
 void SlippyMapWidget::mouseReleaseEvent(QMouseEvent*)
 {
+    if (p->InSelection) {
+        QRect SelectionRect(p->SelectionStart, p->SelectionEnd);
+        if (SelectionRect.width() && SelectionRect.height()) {
+            makeSelection(SelectionRect);
+            update();
+            emit redraw();
+        } else {
+            /* Default to full viewport */
+            makeSelection(QRect(0, 0, width(), height()));
+        }
+    }
     p->InDrag = false;
+    p->InSelection = false;
 }
 
 void SlippyMapWidget::mouseMoveEvent(QMouseEvent* ev)
 {
-    QPoint Delta = ev->pos()-p->PreviousDrag;
-    if (!Delta.isNull())
-    {
-        p->InDrag = true;
-        p->Lat -= Delta.x()/(TILESIZE*1.);
-        p->Lon -= Delta.y()/(TILESIZE*1.);
-        p->PreviousDrag = ev->pos();
-        update();
-        emit redraw();
+    if (p->InDrag) {
+        QPoint Delta = ev->pos()-p->PreviousDrag;
+        if (!Delta.isNull())
+        {
+            p->Lon -= Delta.x()/(TILESIZE*1.);
+            p->Lat -= Delta.y()/(TILESIZE*1.);
+            p->PreviousDrag = ev->pos();
+            update();
+            emit redraw();
+        }
+    } else if (p->InSelection) {
+       p->SelectionEnd = ev->pos();
+       update();
+       emit redraw();
     }
 }
 
-void SlippyMapWidget::on_customContextMenuRequested(const QPoint & pos)
-{
-    QMenu menu;
-
-    QAction* resetViewAction = new QAction(tr("Reset view"), this);
-    connect(resetViewAction, SIGNAL(triggered(bool)), this, SLOT(on_resetViewAction_triggered(bool)));
-
-    menu.addAction(resetViewAction);
-    menu.exec(mapToGlobal(pos));
-}
-
 void SlippyMapWidget::on_resetViewAction_triggered(bool)
 {
-    p->Lat = 1.0;
     p->Lon = 1.0;
+    p->Lat = 1.0;
     p->Zoom = 1;
     update();
 }
@@ -334,7 +420,9 @@ void SlippyMapCache::preload(const Coord& C, const QString& Filename)
 
 void SlippyMapCache::on_requestFinished(QNetworkReply *reply)
 {
-    qDebug() << "Finished with error code" << reply->error();
+    if (reply->error() != QNetworkReply::NoError) {
+        qWarning() << "SlippyMap: Finished with error code " << reply->error() << ": " << reply->errorString();
+    }
     if (reply == DownloadReply)
     {
         DownloadBusy = false;
@@ -413,7 +501,7 @@ void SlippyMapCache::startDownload()
             Queue.erase(Queue.begin());
             QUrl reqUrl(baseUrl);
             reqUrl.setPath(QString("/%1/%2/%3.png").arg(DownloadCoord.Zoom).arg(DownloadCoord.X).arg(DownloadCoord.Y));
-            qDebug() << "Starting download with url: " << reqUrl;
+            //qDebug() << "Starting download with url: " << reqUrl;
             QNetworkRequest req(reqUrl);
             req.setRawHeader(QByteArray("User-Agent"), USER_AGENT.toLatin1());
             DownloadReply = Download.get(req);
diff --git a/src/Utils/SlippyMapWidget.h b/src/Utils/SlippyMapWidget.h
index fad2c13..1f9d7bd 100644
--- a/src/Utils/SlippyMapWidget.h
+++ b/src/Utils/SlippyMapWidget.h
@@ -72,7 +72,7 @@ class SlippyMapWidget :	public QWidget
         bool isDragging();
 
         void setViewportArea(QRectF theRect);
-        QRectF viewArea() const;
+        QRectF selectedArea();
 
         static SlippyMapCache* theSlippyCache;
 
@@ -82,9 +82,11 @@ class SlippyMapWidget :	public QWidget
     private:
         SlippyMapWidgetPrivate* p;
         void ZoomTo(const QPoint & NewCenter, int NewZoom);
+        void normalizeCoordinates(void);
+        void makeSelection(const QRect& relative);
+        QPoint coord2relative(const QPointF &coord) const;
 
     private slots:
-        virtual void on_customContextMenuRequested(const QPoint & pos);
         virtual void on_resetViewAction_triggered(bool);
 };
 
diff --git a/src/Utils/TagSelector.cpp b/src/Utils/TagSelector.cpp
index 6e1f81b..a49ed2a 100644
--- a/src/Utils/TagSelector.cpp
+++ b/src/Utils/TagSelector.cpp
@@ -24,7 +24,7 @@ bool canParseSymbol(const QString& Expression, int& idx, char Symbol)
 
 bool canParseString(const QString& Expression, int& idx, QString& Key)
 {
-    Key = "";
+    Key.clear();
     skipWhite(Expression,idx);
     if (idx >= Expression.length())
         return false;
@@ -49,7 +49,7 @@ bool canParseString(const QString& Expression, int& idx, QString& Key)
 
 bool canParseValue(const QString& Expression, int& idx, QString& Key)
 {
-    Key = "";
+    Key.clear();
     skipWhite(Expression,idx);
     if (idx >= Expression.length())
         return false;
@@ -168,7 +168,7 @@ TagSelectorIsOneOf* parseTagSelectorIsOneOf(const QString& Expression, int& idx)
         return 0;
     if (!canParseSymbol(Expression, idx, '('))
         return 0;
-    QList<QString> Values;
+    QStringList Values;
     while (true)
     {
         QString Value;
@@ -773,18 +773,12 @@ TagSelectorMatchResult TagSelectorOperator::matches(const IFeature* F, qreal Pix
 
 QString TagSelectorOperator::asExpression(bool) const
 {
-    QString R;
-    R += "[";
-    R += Key;
-    R += "]";
-    R += Oper;
-    R += Value;
-    return R;
+    return "[" + Key + "]" + Oper + Value;
 }
 
 /* TAGSELECTORISONEOF */
 
-TagSelectorIsOneOf::TagSelectorIsOneOf(const QString& key, const QList<QString>& values)
+TagSelectorIsOneOf::TagSelectorIsOneOf(const QString& key, const QStringList& values)
     : Key(key), Values(values)
     , specialKey(TagSelectKey_None)
     , specialValue(TagSelectValue_None)
@@ -875,18 +869,7 @@ TagSelectorMatchResult TagSelectorIsOneOf::matches(const IFeature* F, qreal /*Pi
 
 QString TagSelectorIsOneOf::asExpression(bool) const
 {
-    QString R;
-    R += "[";
-    R += Key;
-    R += "] isoneof (";
-    for (int i=0; i<Values.size(); ++i)
-    {
-        if (i)
-            R += " , ";
-        R += Values[i];
-    }
-    R += ")";
-    return R;
+    return "[" + Key + "] isoneof (" + Values.join(" , ") + ")";
 }
 
 /* TAGSELECTORTYPEIS */
@@ -920,10 +903,7 @@ TagSelectorMatchResult TagSelectorTypeIs::matches(const IFeature* F, qreal /*Pix
 
 QString TagSelectorTypeIs::asExpression(bool) const
 {
-    QString R;
-    R += "Type is ";
-    R += Type;
-    return R;
+    return "Type is " + Type;
 }
 
 /* TAGSELECTORHASTAGS */
@@ -950,9 +930,7 @@ TagSelectorMatchResult TagSelectorHasTags::matches(const IFeature* F, qreal /*Pi
 
 QString TagSelectorHasTags::asExpression(bool) const
 {
-    QString R;
-    R += "HasTags";
-    return R;
+    return "HasTags";
 }
 
 /* TAGSELECTOROR */
@@ -964,8 +942,7 @@ TagSelectorOr::TagSelectorOr(const QList<TagSelector*> terms)
 
 TagSelectorOr::~TagSelectorOr()
 {
-    for (int i=0; i<Terms.size(); ++i)
-        delete Terms[i];
+    qDeleteAll(Terms);
 }
 
 TagSelector* TagSelectorOr::copy() const
@@ -1010,8 +987,7 @@ TagSelectorAnd::TagSelectorAnd(const QList<TagSelector*> terms)
 
 TagSelectorAnd::~TagSelectorAnd()
 {
-    for (int i=0; i<Terms.size(); ++i)
-        delete Terms[i];
+    qDeleteAll(Terms);
 }
 
 TagSelector* TagSelectorAnd::copy() const
@@ -1071,12 +1047,8 @@ TagSelectorMatchResult TagSelectorNot::matches(const IFeature* F, qreal PixelPer
 QString TagSelectorNot::asExpression(bool /* Precedence */) const
 {
     if (!Term)
-        return "";
-    QString R;
-    R += "not(";
-    R += Term->asExpression(true);
-    R += ")";
-    return R;
+        return QString();
+    return "not(" + Term->asExpression(true) + ")";
 }
 
 /* TAGSELECTORPARENT */
@@ -1116,12 +1088,8 @@ TagSelectorMatchResult TagSelectorParent::matches(const IFeature* F, qreal Pixel
 QString TagSelectorParent::asExpression(bool /* Precedence */) const
 {
     if (!Term)
-        return "";
-    QString R;
-    R += " parent(";
-    R += Term->asExpression(true);
-    R += ")";
-    return R;
+        return QString();
+    return " parent(" + Term->asExpression(true) + ")";
 }
 
 /* TAGSELECTORFALSE */
@@ -1142,9 +1110,7 @@ TagSelectorMatchResult TagSelectorFalse::matches(const IFeature* /* F */, qreal
 
 QString TagSelectorFalse::asExpression(bool /* Precedence */) const
 {
-    QString R;
-    R += " false ";
-    return R;
+    return " false ";
 }
 
 /* TAGSELECTORTRUE */
@@ -1165,9 +1131,7 @@ TagSelectorMatchResult TagSelectorTrue::matches(const IFeature* /* F */, qreal /
 
 QString TagSelectorTrue::asExpression(bool /* Precedence */) const
 {
-    QString R;
-    R += " true ";
-    return R;
+    return " true ";
 }
 
 /* TAGSELECTORDEFAULT */
@@ -1198,9 +1162,6 @@ TagSelectorMatchResult TagSelectorDefault::matches(const IFeature* F, qreal Pixe
 
 QString TagSelectorDefault::asExpression(bool /* Precedence */) const
 {
-    QString R;
-    R += " [Default] ";
-    R += Term->asExpression(true);
-    return R;
+    return " [Default] " + Term->asExpression(true);
 }
 
diff --git a/src/Utils/TagSelector.h b/src/Utils/TagSelector.h
index 24b3e07..92493e7 100644
--- a/src/Utils/TagSelector.h
+++ b/src/Utils/TagSelector.h
@@ -83,7 +83,7 @@ class TagSelectorOperator : public TagSelector
 class TagSelectorIsOneOf : public TagSelector
 {
     public:
-        TagSelectorIsOneOf(const QString& key, const QList<QString>& values);
+        TagSelectorIsOneOf(const QString& key, const QStringList& values);
 
         virtual TagSelector* copy() const;
         virtual TagSelectorMatchResult matches(const IFeature* F, qreal PixelPerM) const;
@@ -91,9 +91,9 @@ class TagSelectorIsOneOf : public TagSelector
 
     private:
         QList<QRegExp> rxv;
-        QList<QString> exactMatchv;
+        QStringList exactMatchv;
         QString Key;
-        QList<QString> Values;
+        QStringList Values;
         TagSelectorSpecialKey specialKey;
         TagSelectorSpecialValue specialValue;
 };
diff --git a/src/common/AboutDialog.ui b/src/common/AboutDialog.ui
index 710c121..6a81361 100644
--- a/src/common/AboutDialog.ui
+++ b/src/common/AboutDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>435</width>
+    <width>525</width>
     <height>469</height>
    </rect>
   </property>
@@ -23,50 +23,90 @@
       <enum>QLayout::SetMinimumSize</enum>
      </property>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
+      <layout class="QGridLayout" name="gridLayout">
+       <property name="horizontalSpacing">
+        <number>20</number>
+       </property>
+       <property name="verticalSpacing">
+        <number>-1</number>
+       </property>
+       <item row="2" column="1">
+        <widget class="QLabel" name="Proj4Version">
+         <property name="styleSheet">
+          <string notr="true">QLabel { font-size:small; font-weight:bold; }</string>
+         </property>
+         <property name="text">
+          <string notr="true">%1</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
         <widget class="QLabel" name="Version">
+         <property name="styleSheet">
+          <string notr="true">QLabel { font-size:small; font-weight:bold; }</string>
+         </property>
          <property name="text">
-          <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></string>
+          <string notr="true">%1</string>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QLabel" name="QTVersion">
+       <item row="0" column="0">
+        <widget class="QLabel" name="VersionLabel">
+         <property name="styleSheet">
+          <string notr="true">QLabel { font-size: x-small; font-style: italic; }</string>
+         </property>
          <property name="text">
-          <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></string>
+          <string>Merkaartor version</string>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QLabel" name="Proj4Version">
+       <item row="1" column="1">
+        <widget class="QLabel" name="QTVersion">
+         <property name="styleSheet">
+          <string notr="true">QLabel { font-size:small; font-weight:bold; }</string>
+         </property>
          <property name="text">
-          <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></string>
+          <string notr="true">%1 (%2)</string>
          </property>
         </widget>
        </item>
-       <item>
+       <item row="3" column="1">
         <widget class="QLabel" name="GdalVersion">
+         <property name="styleSheet">
+          <string notr="true">QLabel { font-size:small; font-weight:bold; }</string>
+         </property>
          <property name="text">
-          <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></string>
+          <string notr="true">%1</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="QTVersionLabel">
+         <property name="styleSheet">
+          <string notr="true">QLabel { font-size: x-small; font-style: italic; }</string>
+         </property>
+         <property name="text">
+          <string>Qt version</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="Proj4VersionLabel">
+         <property name="styleSheet">
+          <string notr="true">QLabel { font-size: x-small; font-style: italic; }</string>
+         </property>
+         <property name="text">
+          <string>PROJ.4 version</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="GdalVersionLabel">
+         <property name="styleSheet">
+          <string notr="true">QLabel { font-size: x-small; font-style: italic; }</string>
+         </property>
+         <property name="text">
+          <string>GDAL version</string>
          </property>
         </widget>
        </item>
@@ -100,7 +140,7 @@ p, li { white-space: pre-wrap; }
         </size>
        </property>
        <property name="text">
-        <string>TextLabel</string>
+        <string notr="true">TextLabel</string>
        </property>
       </widget>
      </item>
@@ -116,18 +156,17 @@ p, li { white-space: pre-wrap; }
    <item>
     <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>This program is licensed under the GNU Public License v2</string>
+      <string>This program is licensed under the GNU General Public License v2</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QLabel" name="lblUrl">
      <property name="text">
-      <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></string>
+      <string notr="true"><a href="http://merkaartor.be/">http://merkaartor.be/</a></string>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
      </property>
      <property name="textInteractionFlags">
       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
diff --git a/src/common/Document.cpp b/src/common/Document.cpp
index d17072d..a7f2406 100644
--- a/src/common/Document.cpp
+++ b/src/common/Document.cpp
@@ -154,7 +154,7 @@ void Document::lockPainters() {
 }
 
 void Document::lockPaintersForWrite() {
-    qDebug() << "LockW";
+    p->theFeaturePaintersLock.lockForWrite();
 }
 
 const Painter* Document::getPainter(int i)
@@ -736,9 +736,6 @@ bool Document::importKML(const QString& filename, TrackLayer* NewLayer)
 #ifndef _MOBILE
 bool Document::importGDAL(const QString& filename, DrawingLayer* NewLayer)
 {
-    Q_UNUSED(filename)
-    Q_UNUSED(NewLayer)
-
     ImportExportGdal imp(this);
     if (!imp.loadFile(filename))
         return false;
diff --git a/src/common/FeatureManipulations.cpp b/src/common/FeatureManipulations.cpp
index 6f3d066..34c5270 100644
--- a/src/common/FeatureManipulations.cpp
+++ b/src/common/FeatureManipulations.cpp
@@ -398,7 +398,7 @@ static void handleWaysplitRelations(Document* theDocument, CommandList* theList,
 
 static void splitRoad(Document* theDocument, CommandList* theList, Way* In, const QList<Node*>& Points, QList<Way*>& Result)
 {
-    int pos;
+    int pos = 0;
     if (In->isClosed()) {  // Special case: If area, rotate the area so that the start node is the first point of splitting
 
         QList<Node*> Target;
@@ -1544,6 +1544,7 @@ void terraceArea(Document* theDocument, CommandList* theList, PropertiesDock* th
 
     qreal longestLen = 0.0f;
     unsigned int sides[2];
+    sides[0] = 0;
     for (int i = 0; i < theArea->size()-1; ++i) {
         const Coord p1(theArea->getNode(i)->position());
         const Coord p2(theArea->getNode(i+1)->position());
diff --git a/src/common/Global.cpp b/src/common/Global.cpp
index b731c13..cda7146 100644
--- a/src/common/Global.cpp
+++ b/src/common/Global.cpp
@@ -74,12 +74,12 @@ void g_removeFromTagList(quint32 k, quint32 v)
         tagList.remove(k);
 }
 
-QList<QString> g_getTagKeys()
+QStringList g_getTagKeys()
 {
     return tagKeys;
 }
 
-QList<QString> g_getTagValues()
+QStringList g_getTagValues()
 {
     return tagValues;
 }
diff --git a/src/common/Global.h b/src/common/Global.h
index a0e5696..89ecfe3 100644
--- a/src/common/Global.h
+++ b/src/common/Global.h
@@ -40,8 +40,8 @@ extern MainWindow* g_Merk_MainWindow;
 
 extern QPair<quint32, quint32> g_addToTagList(QString k, QString v);
 extern void g_removeFromTagList(quint32 k, quint32 v);
-extern QList<QString> g_getTagKeys();
-extern QList<QString> g_getTagValues();
+extern QStringList g_getTagKeys();
+extern QStringList g_getTagValues();
 extern const QString& g_getTagKey(int idx);
 extern quint32 g_getTagKeyIndex(const QString& s);
 extern QStringList g_getTagKeyList();
diff --git a/src/common/MapView.cpp b/src/common/MapView.cpp
index c016d73..f488782 100644
--- a/src/common/MapView.cpp
+++ b/src/common/MapView.cpp
@@ -136,7 +136,7 @@ MapView::MapView(QWidget* parent) :
 
 
     p->osmLayer = new OsmRenderLayer(this);
-    connect(p->osmLayer, SIGNAL(renderingDone()), SLOT(update()));
+    connect(p->osmLayer, SIGNAL(renderingDone()), SLOT(renderingDone()));
 }
 
 MapView::~MapView()
@@ -543,6 +543,11 @@ void MapView::drawLatLonGrid(QPainter & P)
     P.restore();
 }
 
+void MapView::drawFeaturesSync(QPainter & P) {
+    while (!p->osmLayer->isRenderingDone());
+    p->osmLayer->drawImage(&P);
+}
+
 void MapView::drawFeatures(QPainter & P)
 {
     p->osmLayer->drawImage(&P);
@@ -848,14 +853,14 @@ void MapView::on_MoveLeft_activated()
     QPoint p(rect().width()/4,0);
     panScreen(p);
 
-//    invalidate(true, true, true);
+    invalidate(true, true, true);
 }
 void MapView::on_MoveRight_activated()
 {
     QPoint p(-rect().width()/4,0);
     panScreen(p);
 
-//    invalidate(true, true, true);
+    invalidate(true, true, true);
 }
 
 void MapView::on_MoveUp_activated()
@@ -863,7 +868,7 @@ void MapView::on_MoveUp_activated()
     QPoint p(0,rect().height()/4);
     panScreen(p);
 
-//    invalidate(true, true, true);
+    invalidate(true, true, true);
 }
 
 void MapView::on_MoveDown_activated()
@@ -871,7 +876,7 @@ void MapView::on_MoveDown_activated()
     QPoint p(0,-rect().height()/4);
     panScreen(p);
 
-//    invalidate(true, true, true);
+    invalidate(true, true, true);
 }
 
 void MapView::zoomIn()
@@ -884,6 +889,10 @@ void MapView::zoomOut()
     zoom(M_PREFS->getZoomOut()/100., rect().center());
 }
 
+void MapView::renderingDone() {
+    update();
+}
+
 bool MapView::isSelectionLocked()
 {
     return SelectionLocked;
@@ -1134,6 +1143,14 @@ void MapView::setRenderOptions(const RendererOptions &opt)
     p->ROptions = opt;
 }
 
+void MapView::stopRendering() {
+    p->osmLayer->stopRendering();
+}
+
+void MapView::resumeRendering() {
+    p->osmLayer->resumeRendering();
+}
+
 qreal MapView::nodeWidth()
 {
     return p->NodeWidth;
diff --git a/src/common/MapView.h b/src/common/MapView.h
index 7b3c6cf..0101a8f 100644
--- a/src/common/MapView.h
+++ b/src/common/MapView.h
@@ -38,6 +38,7 @@ public:
     void setInteraction(Interaction* anInteraction);
 
     void drawFeatures(QPainter & painter);
+    void drawFeaturesSync(QPainter & P);
     void drawLatLonGrid(QPainter & painter);
     void drawDownloadAreas(QPainter & painter);
     void drawScale(QPainter & painter);
@@ -88,6 +89,9 @@ public:
     RendererOptions renderOptions();
     void setRenderOptions(const RendererOptions& opt);
 
+    void stopRendering();
+    void resumeRendering();
+
     qreal nodeWidth();
 
     QString toPropertiesHtml();
@@ -124,6 +128,8 @@ public slots:
     virtual void zoomIn();
     virtual void zoomOut();
 
+    virtual void renderingDone();
+
 signals:
     void viewportChanged();
 
diff --git a/src/common/Projection.cpp b/src/common/Projection.cpp
index dc4d085..e984d80 100644
--- a/src/common/Projection.cpp
+++ b/src/common/Projection.cpp
@@ -26,6 +26,7 @@ Projection::Projection(void)
     pj_set_searchpath(1, &proj_dir);
 #endif // Q_OS_WIN
 
+
 #ifndef _MOBILE
     theProj = NULL;
     theWGS84Proj = Projection::getProjection("+proj=longlat +ellps=WGS84 +datum=WGS84");
@@ -35,8 +36,17 @@ Projection::Projection(void)
 
 Projection::~Projection(void)
 {
+    /* TODO: pj_free should be called, but it segfaults if two of the same
+     * Projection objects have the same projPJ. A better machinism, perhaps
+     * projPJ caching, should be provided.
+     *
+     * In the meantime, pj_free is not called, which does little harm as it's
+     * usually called at exit only.
+     * */
 #ifndef _MOBILE
-    pj_free(theProj);
+    if (theProj) {
+        //pj_free(theProj);
+    }
 #endif // _MOBILE
 }
 
diff --git a/src/common/TagModel.cpp b/src/common/TagModel.cpp
index dfd40bd..a31f791 100644
--- a/src/common/TagModel.cpp
+++ b/src/common/TagModel.cpp
@@ -6,6 +6,7 @@
 #include "Document.h"
 #include "Feature.h"
 #include "Layer.h"
+#include <QMessageBox>
 
 TagModel::TagModel(MainWindow* aMain)
 : Main(aMain)
@@ -70,7 +71,7 @@ QVariant TagModel::data(const QModelIndex &index, int role) const
             if (index.column() == 0)
                 return newKeyText();
             else
-                return "";
+                return QString();
         }
         else
         {
@@ -83,7 +84,7 @@ QVariant TagModel::data(const QModelIndex &index, int role) const
     else if (role == Qt::EditRole)
     {
         if (index.row() >= Tags.size())
-            return "";
+            return QString();
         else
         {
             if (index.column() == 0)
@@ -121,6 +122,16 @@ bool TagModel::setData(const QModelIndex &index, const QVariant &value, int role
     if (!theFeatures.size()) return false;
     if (index.isValid() && role == Qt::EditRole)
     {
+        /* Check if one of the same name already exists */
+        if (index.column() == 0) {
+            for (int i = 0; i < Tags.size(); i++) {
+                if ((i != index.row()) && (Tags[i].first == value.toString())) {
+                    QMessageBox::warning(NULL, tr("Tag editor"), tr("Tag with this name already exists."));
+                    return false;
+                }
+            }
+        }
+
         if ((int)index.row() == Tags.size())
         {
             if (index.column() == 0)
diff --git a/src/merkaartor.desktop b/src/merkaartor.desktop
index 4eaa998..ecc40a8 100644
--- a/src/merkaartor.desktop
+++ b/src/merkaartor.desktop
@@ -10,4 +10,4 @@ Exec=merkaartor
 Terminal=false
 StartupNotify=false
 Categories=Education;Geography;Network;Qt;
-
+Keywords=OSM;GIS;Map;Geo;
diff --git a/src/qextserialport/posix_qextserialport.cpp b/src/qextserialport/posix_qextserialport.cpp
index ce92fae..989ee7d 100644
--- a/src/qextserialport/posix_qextserialport.cpp
+++ b/src/qextserialport/posix_qextserialport.cpp
@@ -823,7 +823,7 @@ bool Posix_QextSerialPort::open(OpenMode mode)
         Posix_File->setFileName(port);
         qDebug("Trying to open File");
         if (Posix_File->open(QIODevice::ReadWrite|QIODevice::Unbuffered)) {
-            qDebug("Opened File succesfully");
+            qDebug("Opened File successfully");
             /*set open mode*/
             QIODevice::open(mode);
 
diff --git a/src/src.pro b/src/src.pro
index 2cdbfc1..64ca8a7 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,6 +6,13 @@ include (Config.pri)
 #Custom config
 include(Custom.pri)
 
+CONFIG += debug_and_release
+
+# This is a workaround to get qDebug() to stdout on Windows
+win32 {
+	CONFIG += console
+}
+
 isEmpty(SYSTEM_QTSA) {
   include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
 } else {
@@ -15,7 +22,11 @@ isEmpty(SYSTEM_QUAZIP) {
   DEFINES += QUAZIP_STATIC
   include(../3rdparty/quazip-0.7/quazip.pri)
 } else {
-  LIBS += -lquazip
+  isEmpty(SYSTEM_QUAZIP_LDFLAGS) {
+      LIBS += -lquazip
+  } else {
+      LIBS += $$SYSTEM_QUAZIP_LDFLAGS
+  }
 }
 
 #Qt Version
@@ -77,6 +88,9 @@ macx {
     QMAKE_INFO_PLIST = $$PWD/../macos/Info.plist
     # This is where we get the the ports from
     INCLUDEPATH += /opt/local/include
+    # Stuff from homebrew comes from here
+    INCLUDEPATH += /usr/local/include
+    LIBS += -L/usr/local/lib
 }
 
 contains(NVIDIA_HACK,1) {
@@ -164,13 +178,6 @@ win32 {
 }
 
 
-unix {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += sqlite3
-}
-win32 {
-    LIBS += -lsqlite3
-}
 
 DEFINES += SHARE_DIR=$${SHARE_DIR}
 INSTALLS += target
@@ -180,6 +187,7 @@ win32-msvc* {
 }
 
 TRANSLATIONS += \
+    ../translations/merkaartor_en.ts \
     ../translations/merkaartor_ar.ts \
     ../translations/merkaartor_cs.ts \
     ../translations/merkaartor_de.ts \
@@ -200,6 +208,7 @@ TRANSLATIONS += \
     ../translations/merkaartor_pt_BR.ts \
 
 BINTRANSLATIONS += \
+    ../translations/merkaartor_en.qm \
     ../translations/merkaartor_ar.qm \
     ../translations/merkaartor_cs.qm \
     ../translations/merkaartor_de.qm \
@@ -257,16 +266,20 @@ unix {
     QMAKE_CFLAGS += $$system(gdal-config --cflags)
 }
 
+# Setup the PROJ.4
 LIBS += -lproj
+PKGCONFIG += proj
 
 contains (SPATIALITE, 1) {
     DEFINES += USE_SPATIALITE
     unix {
         CONFIG += link_pkgconfig
         PKGCONFIG += spatialite
+        PKGCONFIG += sqlite3
     }
     win32 {
         LIBS += -lspatialite
+        LIBS += -lsqlite3
     }
 }
 contains (PROTOBUF, 1) {
@@ -282,9 +295,58 @@ contains (PROTOBUF, 1) {
 unix:!macx {
     desktop.path = $${PREFIX}/share/applications
     desktop.files = merkaartor.desktop
-    desktopicons.path = $${PREFIX}/share/icons/hicolor/48x48/apps/
-    desktopicons.files = $$PWD/../Icons/48x48/merkaartor.png
-    INSTALLS += desktop desktopicons
+    desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
+    desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
+    desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/
+    desktopicon16x16.files = $$PWD/../Icons/16x16/merkaartor.png
+    desktopicon22x22.path = $${PREFIX}/share/icons/hicolor/22x22/apps/
+    desktopicon22x22.files = $$PWD/../Icons/22x22/merkaartor.png
+    desktopicon24x24.path = $${PREFIX}/share/icons/hicolor/24x24/apps/
+    desktopicon24x24.files = $$PWD/../Icons/24x24/merkaartor.png
+    desktopicon32x32.path = $${PREFIX}/share/icons/hicolor/32x32/apps/
+    desktopicon32x32.files = $$PWD/../Icons/32x32/merkaartor.png
+    desktopicon36x36.path = $${PREFIX}/share/icons/hicolor/36x36/apps/
+    desktopicon36x36.files = $$PWD/../Icons/36x36/merkaartor.png
+    desktopicon40x40.path = $${PREFIX}/share/icons/hicolor/40x40/apps/
+    desktopicon40x40.files = $$PWD/../Icons/40x40/merkaartor.png
+    desktopicon42x42.path = $${PREFIX}/share/icons/hicolor/42x42/apps/
+    desktopicon42x42.files = $$PWD/../Icons/42x42/merkaartor.png
+    desktopicon48x48.path = $${PREFIX}/share/icons/hicolor/48x48/apps/
+    desktopicon48x48.files = $$PWD/../Icons/48x48/merkaartor.png
+    desktopicon64x64.path = $${PREFIX}/share/icons/hicolor/64x64/apps/
+    desktopicon64x64.files = $$PWD/../Icons/64x64/merkaartor.png
+    desktopicon72x72.path = $${PREFIX}/share/icons/hicolor/72x72/apps/
+    desktopicon72x72.files = $$PWD/../Icons/72x72/merkaartor.png
+    desktopicon80x80.path = $${PREFIX}/share/icons/hicolor/80x80/apps/
+    desktopicon80x80.files = $$PWD/../Icons/80x80/merkaartor.png
+    desktopicon96x96.path = $${PREFIX}/share/icons/hicolor/96x96/apps/
+    desktopicon96x96.files = $$PWD/../Icons/96x96/merkaartor.png
+    desktopicon128x128.path = $${PREFIX}/share/icons/hicolor/128x128/apps/
+    desktopicon128x128.files = $$PWD/../Icons/128x128/merkaartor.png
+    desktopicon192x192.path = $${PREFIX}/share/icons/hicolor/192x192/apps/
+    desktopicon192x192.files = $$PWD/../Icons/192x192/merkaartor.png
+    desktopicon256x256.path = $${PREFIX}/share/icons/hicolor/256x256/apps/
+    desktopicon256x256.files = $$PWD/../Icons/256x256/merkaartor.png
+    desktopicon512x512.path = $${PREFIX}/share/icons/hicolor/512x512/apps/
+    desktopicon512x512.files = $$PWD/../Icons/512x512/merkaartor.png
+    INSTALLS += desktop \
+                desktopicon8x8 \
+                desktopicon16x16 \
+                desktopicon22x22 \
+                desktopicon24x24 \
+                desktopicon32x32 \
+                desktopicon36x36 \
+                desktopicon40x40 \
+                desktopicon42x42 \
+                desktopicon48x48 \
+                desktopicon64x64 \
+                desktopicon72x72 \
+                desktopicon80x80 \
+                desktopicon96x96 \
+                desktopicon128x128 \
+                desktopicon192x192 \
+                desktopicon256x256 \
+                desktopicon512x512
 }
 
 
diff --git a/translations/README b/translations/README
deleted file mode 100644
index a7c000f..0000000
--- a/translations/README
+++ /dev/null
@@ -1,25 +0,0 @@
-Merkaartor stores translations in the .ts files from Qt and the .mat files of
-templates. Translations can be done using linguist and hand written XML directly
-in SVN or using Launchpad (preferred way) at
-https://translations.launchpad.net/merkaartor/trunk
-
-The script in this directory allows to convert between the two XML file types
-and the standard gettext .po files.
-
-The templates and the main translations are separated in two different sets
-(name templates and merkaartor). These two should not be mixed.
-
-Synchronisation may be like following:
-  - Update whole merkaartor svn using "svn update" in root directory
-  - Remove old stuff: make clean
-  - Download po-files from Launchpad and store them in this directory
-  - Call conversion: make
-  - Checkin modified templates (in ../Templates) and .ts files
-  - Upload changed .po and .pot files to launchpad
-
-Conflict solving:
-  - When no translations have been changed in SVN, then "all p(o)" may be
-    choosen
-  - When local changes have been done, conflicts should be solved one-by-one
-  - "all up(s)tream" should only be choosen when you synchonised data directly
-    before you started to make local translations.
diff --git a/translations/README.md b/translations/README.md
new file mode 100644
index 0000000..e6f15a9
--- /dev/null
+++ b/translations/README.md
@@ -0,0 +1,25 @@
+Merkaartor currently uses Qt Linguist and Transifex to translate stuff. Although
+you might be tempted to change translations in git repo directly, please don't.
+Translation files are meant to be updated via Transifex.com only, and pulled
+into the repository before version release.
+
+The regular workflow is:
+
+0) From time to time, update translation files on Transifex:
+    
+    $ lupdate -no-obsolete Merkaartor.pro
+    $ tx push -s
+
+   This pushes the original english strings to Transifex, updating the database and
+   allowing new strings to be downloaded.
+
+1) Before release, Transifex data should be pulled and commited into the
+repository. This is not necessary, but serves as a backup in case something
+terrible happens to Transifex.
+
+    $ tx pull
+    $ git commit translations/*.ts
+
+2) During release, the regular qt tools are used to bundle translations. Care
+should be taken to include new translations in Merkaartor.pro, so the .qm files
+get generated properly.
diff --git a/translations/merkaartor_ar.ts b/translations/merkaartor_ar.ts
index 939d0a0..666cc9f 100644
--- a/translations/merkaartor_ar.ts
+++ b/translations/merkaartor_ar.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="ar">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,57 +24,57 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished"></translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>سجل التغييرات</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>مُوافق</translation>
     </message>
@@ -84,93 +82,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>الوصف</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>الإختصار</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>إ&ستيراد</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&صدّر</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&غيابي</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&موافق</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>إل&غاء</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>محرّر الإختصار</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>غير قادر على فتح الملف</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>لم أستطع فتح %1</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>غير معنون</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>كلّ الملفات (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>غير قادر على فتح ملف الحفظ</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>إستحالة فتح %1 للكتابة.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -214,24 +242,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -261,9 +282,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -274,7 +295,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>التكبير</translation>
     </message>
@@ -363,6 +384,11 @@ API message is '%1'</source>
 رسالة الــAPI هي '%1'</translation>
     </message>
     <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="464"/>
+        <source>Uploading changes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="490"/>
         <source>OPEN changeset</source>
         <translation>إفتح حزمة تغييرات</translation>
@@ -372,11 +398,6 @@ API message is '%1'</source>
         <source>CLOSE changeset</source>
         <translation>أغلق حزمة التغييرات</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="464"/>
-        <source>Uploading changes...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -411,12 +432,12 @@ API message is '%1'</source>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
         <source>Checking changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="184"/>
@@ -477,97 +498,97 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>غير معنون</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>طبقة الخرطوش</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>حمّلت الطبقة</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>الصور الخلفية</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -595,12 +616,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -621,251 +642,232 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>فشل عملية التنزيل</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>تنزيل %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>خطأ</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>لم أنزل الكافي</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>نزّل الـ %1 غير المحلول من %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>جاري التنزيل من OSM (جاري الإتصال)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation>
-رسالة الــAPI هي '%1'</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>فشل إسم المستخدم/كلمة المرور</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>تناقض من %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>تناقضات غير محلولة</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>إكتشاف طرقات/علاقات فارغة</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>الرجاء حلّ التناقضات الموجودة أولاً</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>إحتمال أن تكون الطرقات/العلاقات خطأ
+هل تريد وضع علامة عليهم للمحو ؟</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>أمحي الميزة الفارغة %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>تمّ إكتشاف تناقد</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>جاري تنزيل نقاط الأثر %1-%2</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>تنزيل %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>خطأ</translation>
     </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>نزّل الـ %1 غير المحلول من %2</translation>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>جاري التنزيل...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>تناقض من %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>جاري التنزيل من OSM (جاري الإتصال)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>تمّ إكتشاف تناقد</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation>
+رسالة الــAPI هي '%1'</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>إكتشاف طرقات/علاقات فارغة</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>فشل عملية التنزيل</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>إحتمال أن تكون الطرقات/العلاقات خطأ
-هل تريد وضع علامة عليهم للمحو ؟</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>فشل إسم المستخدم/كلمة المرور</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>أمحي الميزة الفارغة %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>تناقضات غير محلولة</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>جاري تنزيل %1,%2 (نسبة التكبير/التصغير %3)...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>الرجاء حلّ التناقضات الموجودة أولاً</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>جاري التنزيل...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>جاري تنزيل نقاط الأثر %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>جاري تنزيل %1,%2 (نسبة التكبير/التصغير %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>أغلِق</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>التكبير</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>أغلِق</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -916,12 +918,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="433"/>
         <source>Download missing children</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>إضافة إلى الاختيار</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="442"/>
@@ -936,18 +943,13 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="444"/>
         <source>POI's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="445"/>
         <source>All</source>
         <translation>الكلّ</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>إضافة إلى الاختيار</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -959,17 +961,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="72"/>
         <source>Only features fully within the viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -987,7 +989,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="30"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
@@ -998,7 +1000,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>أغلِق</translation>
     </message>
@@ -1008,17 +1010,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="47"/>
         <source>Filter list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="76"/>
@@ -1028,7 +1030,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="93"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
@@ -1054,268 +1056,242 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>صور جغرافية</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>حدّد مركز الخريطة</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>أحذف الصور</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>أنسخ إسم الملف إلى الحافظة</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>إختر الصورة التالية</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>إختر الصورة السابقة</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>حمّل صور جغرافية معلّمة</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>إختر الطبقة اللتي تنتمي إليها الصورة:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>جاري تحميل الصور...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>إجهاض عملية التحميل</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>لا ملف كهذا</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>غير قادر للعثور على الصورة  "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>خطأ عند محاولة فتح "%2":
+%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>خطء عند تحميل معطيات الــ EXIF من "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation>ضع الصور غالباً في:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>آخر الممر</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>بداية الممر</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>س.س.د.د.ث.ث.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>لا نقاط أثرات</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>لم أجد نقاط أثرات للصورة "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ث.ث. 'ثواني'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'دقائق و ' ss 'ثواني'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'ساعات,' mm 'دقائق و ' ss 'ثواني'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>الصورة غير الصحيحة ؟</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>لا ملف كهذا</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>حدّد مركز الخريطة</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>غير قادر للعثور على الصورة  "%1".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>خطأ عند محاولة فتح "%2":
-%1</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>لا نقاط أثرات</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>لم أجد نقاط أثرات للصورة "%1"</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>خطء عند تحميل معطيات الــ EXIF من "%1".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <source>Error while opening "%1":
-%2</source>
-        <translation>خطء عند محاولة فتح "%1":
-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>إختر الصورة التالية</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>إختر الصورة السابقة</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <source>Error while opening "%1":
+%2</source>
+        <translation>خطء عند محاولة فتح "%1":
+%2</translation>
     </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>بنية الإحداثيات غير صحيحة</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>الإحداثيات يجب أن تكون: خطّ الطول اليسار، خطّ العرض الأسفل، خطّ العرض اليمين، خطّ العرض الأعلى</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>يجب أن تكون الإحداثيات على الشكل التالي: '<مركز خط العرض>, <مركز خط الطول>, <إمتداد خط العرض>, <إمتداد خط الطول>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>إذهب إلى</translation>
@@ -1328,17 +1304,17 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1363,7 +1339,7 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="203"/>
         <source>OSM XAPI url</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="225"/>
@@ -1371,228 +1347,156 @@ Do you still want to use it?</source>
         <source>Search</source>
         <translation>إبحث</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>بنية الإحداثيات غير صحيحة</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>الإحداثيات يجب أن تكون: خطّ الطول اليسار، خطّ العرض الأسفل، خطّ العرض اليمين، خطّ العرض الأعلى</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>يجب أن تكون الإحداثيات على الشكل التالي: '<مركز خط العرض>, <مركز خط الطول>, <إمتداد خط العرض>, <إمتداد خط الطول>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>لا شيء</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>التكبير</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>أغلِق</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>مكيّف الــ WMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>مكيف الــTMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>الخريطة - بدون</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>الخريطة - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>قياس البلاطة</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>خط الطول</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>خط العرض</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>إسقاط غير صالح</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>الملف غير صحيح</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>لم أستطع فتح %1</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>غير معنون</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>كلّ الملفات (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>إستحالة فتح %1 للكتابة.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>مربع الحوار</translation>
@@ -1600,14 +1504,14 @@ Do you really want to exit?</source>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
         <source>Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1615,52 +1519,52 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
         <source>Specifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
         <source>First line contains headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
         <source>Delimiter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
         <source>Colon (,)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="131"/>
         <source>Semicolon (;)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="138"/>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="145"/>
         <source>Other:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1670,131 +1574,237 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
         <source>Projection (in PROJ4 format; leave blank for latitude/longitude)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="227"/>
         <source>Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="254"/>
         <source>Field list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
         <source>Field Type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="310"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="336"/>
         <source>Import range</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="342"/>
         <source>From (0 from start):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="352"/>
         <source>To (0 to End):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="367"/>
         <source>Load settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="374"/>
         <source>Save settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
-        <translation>المعلومات</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>خط الطول</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
-        <translation>القياس</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>خط العرض</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
-        <translation>الميزات</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>إسقاط غير صالح</translation>
     </message>
-</context>
-<context>
-    <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
-        <source>Show All</source>
-        <translation>أعرض الكلّ</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
-        <source>Hide All</source>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>الملف غير صحيح</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>لم أستطع فتح %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>غير معنون</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>كلّ الملفات (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>إستحالة فتح %1 للكتابة.</translation>
+    </message>
+</context>
+<context>
+    <name>ImportExportGdal</name>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InfoDock</name>
+    <message>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation>المعلومات</translation>
+    </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation>القياس</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
+        <translation>الميزات</translation>
+    </message>
+</context>
+<context>
+    <name>LayerDock</name>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
+        <source>Show All</source>
+        <translation>أعرض الكلّ</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
+        <source>Hide All</source>
         <translation>إخفاء الكلّ</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
+        <source>Readonly All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
+        <source>Readonly None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
+        <source>Close</source>
+        <translation>أغلِق</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="395"/>
         <source>Layers</source>
         <translation>الطبقات</translation>
@@ -1807,17 +1817,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
@@ -1825,78 +1830,68 @@ p, li { white-space: pre-wrap; }
         <translation>الأثرات</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
-        <source>Readonly All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
-        <source>Readonly None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
-        <source>Close</source>
-        <translation>أغلِق</translation>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>الشكل</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation>ظاهر</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation>فقط للقراءة</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>منحفض</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>عالي</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>غير شفاف</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>اللاشفافية</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>الشكل</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1904,17 +1899,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1928,2840 +1923,2861 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>أنشئ المنطقة %1</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&مساعدة</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>المنطقة: أنشئ الطريق %1</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>أن&شئ</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>المنطقة: أنهي الطريق %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&طريق</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>المنطقة: أضف العقدة %1 إلى الطريق %2</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&حرر</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>ا&عرض</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>إ&شارات مرجعية</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>أضف العقدة إلى الطريق %1 المزدوجة الممرات</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>عيّن الإ&سقاة</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>عيّن غموض ال&مساحة</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>أنشئ عقدة في الطريق: %1</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&ملف</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&صدّر</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>إنشاء مستديرة %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>الم&فتوحة حديثاً</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>أنشئ العقدة %1 في الطريق %2</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>الم&صدّر حديثاً</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>%1إنشاء الطريق :</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>ال&عدة</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>أنشئ العقدة : %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>ال&زيّ</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>أضف العقدة %1 إلى الطريق %2</translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&العقدة</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>وجدتُ عقد على نفس الموقع.</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&النافذة</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>أدمج العقد إلى %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>أحذف الميزة %1</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>ال&خصوصية</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>ال&طبقات</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&نطام العالمي لتحديد الموقع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>البلاطة %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>ال&علاقة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>الخصائص...</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>منحفض</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>أعرض &أسهم الإتجاه</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>عالي</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>غير شفاف</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>إ&نهاء</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&حول</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>إ&فتح</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>أنشئ مستند جديد و إستورد ملفاً</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>كبّر/صغّر ال&كلّ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPSجهاز تحديد المواقع العالمي</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>الطبقات</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>كبّر ال&نافذة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>كبّر النافذة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>الخصوصية</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>العقدة</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>&صغّر الرؤية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>العلاقة</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>&كبّر الرؤية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>الأدوات/العدة</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>كبّر الرؤية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>صلة منحنية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>الحافظة غير صالحة</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>ت&راجع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>تصميم تبادل الملفات (*.gpx) لجهاز تحديد المواقع العالمي
-</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&كرّر</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>تصميم المفات OpenStreetMap (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>ح&رّك</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>إ&ستيراد</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>مستند KML (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>إستورد ملفاً إلى داخل المستند الحالي</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&نزّل</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>نزّل معطيات الخريطة لمنطقة أخرى</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>ملف شكل ESRI  (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>وصلة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>أنتج وصلة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>مستند Merkaartor (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>الطريق</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>إ&نتقي</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&حمّل</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>حمّل التغييرات إلى المخدم</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>ألغي</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>إ&زالة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>تغييرات غير محفوطة</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>أنشئ طريق جديدة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>أنشئ عقدة جديدة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>تحذيرمشدد عن حقوق المؤلف</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>أ&عكس</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>أعكس إتجاه الطريق</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&إذهب إلى...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&طريق ذو إتجاهين</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>ألصق الطرقات</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>إفسخ الطرقات</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>أنشئ مسديرة سير</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>أفصل الطرقات</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&جديد</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>انشيء مستند جديد</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>إ&قطع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>إ&جمع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>أدمج الطرقات الموصولة في طريق واحدة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&أفصلها عن بعض البعض</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>أفصل</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>أفصل الطرقات الموصولة عن بعضها البعض</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>&علاقة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>أنشئ العلاقة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&المساحة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>إصطف العقد</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>إنشئ مساحة جديدة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>أفصل العقدة %1</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&حرّر...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>أضف العضو إلى العلاقة</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>إحفظ &كــ ...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>أحذف العضو من العلاقة</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&حمّل...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&طريق منحنية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>الت&فضيلات...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>ال&كلّ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>التنسيقات المتوفّرة</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>صدّر كلّ الطبقات الظاهرة إلى ملف</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>إ&بحث...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>ابحث</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>إبحث و إختر بنود</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&نافذة الرؤية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>أضف إشارة مرجعية</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>حدد إسم الإشارة المرجعية</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>أ&ضف...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>تحذير: إسم الإشارة المرجعية موجود مسبقاً</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>أ&حذف...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>أدخل واحداً جديداً، حافظ على الحالي للكتابة عليه أو ألغي.</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>إ&دمج</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>إزالة الإشارة المرجعية</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>دمج العقد</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>إختر الإشارة المرجعية لحذفها.</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>أدمج العقد المختارة (ستبقى العقد المحددة أولاً)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>إحف&ظ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&مساعدة</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>إحفظ في ملف</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>أن&شئ</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&طريق</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>نزّل المزيد</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&حرر</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>نزّل المزيد من المعطيات للمنطقة الحالية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>ا&عرض</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>إ&شارات مرجعية</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>عيّن الإ&سقاة</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&خصائص</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>أعرض &أسهم الإتجاه</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>عيّن غموض ال&مساحة</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&ملف</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&صدّر</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>الم&فتوحة حديثاً</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>ال&معلومات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>الم&صدّر حديثاً</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>ال&عدة</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>ال&زيّ</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>إ&صطف</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&العقدة</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>إصطف العقد</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&النافذة</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>صفّ العقد المحددة في خط جالس. الأثنتين المختارة أولاً تعطيك الخط.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>ال&خصوصية</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>ال&طبقات</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&نطام العالمي لتحديد الموقع</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>ال&علاقة</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>أعرض المساحات ال&منزلة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>إ&نهاء</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&حول</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>إ&نسخ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>إ&فتح</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>أنسخ الخصائص و الأوسمة المختارة إلى الحافظة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>أنشئ مستند جديد و إستورد ملفاً</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>كبّر/صغّر ال&كلّ</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>كبّر ال&نافذة</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>كبّر النافذة</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>&صغّر الرؤية</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>&كبّر الرؤية</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>كبّر الرؤية</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>المختارة...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>صلة منحنية</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>ألصق</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>ت&راجع</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&كرّر</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>ح&رّك</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (ثناءي)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>إ&ستيراد</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>أودع الخاصية في طبقة العمل</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>إستورد ملفاً إلى داخل المستند الحالي</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&نزّل</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>نزّل معطيات الخريطة لمنطقة أخرى</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>أقلب شريط الأدوات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>وصلة</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>إطهار/إخفاء شريط الأدوات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>أنتج وصلة</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>إخفاء الكلّ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>إ&نتقي</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>أعرض الكلّ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>&طبقة الصورة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&حمّل</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>حمّل التغييرات إلى المخدم</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>إ&زالة</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&إبدأ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>أنشئ طريق جديدة</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>إبدء تشغيل جهاز الــGPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&كرّر التشغيل</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>أنشئ عقدة جديدة</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&نطام العالمي لتحديد الموقع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>أ&عكس</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>إخفاء/عرض حاضن جهاز تحديد المواقع العالمي</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>أعكس إتجاه الطريق</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&إذهب إلى...</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>&قفّ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>قِفّ  تشغيل جهاز الــGPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&طريق ذو إتجاهين</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&حدّد المركز على جهاز النظام العالمي لتحديد الموقع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>أعرض &قطع الأثر</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>أنشئ مسديرة سير</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&جديد</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>أعرض ال&مقياس</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>انشيء مستند جديد</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>إ&قطع</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>أعر&ض العلاقات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>أعرض خلفية الطرقات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>إ&جمع</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>أعرض حدود الطرقات</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>أدمج الطرقات الموصولة في طريق واحدة</translation>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>سجِّل</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&أفصلها عن بعض البعض</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>أفصل</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>توقف</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>أفصل الطرقات الموصولة عن بعضها البعض</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>أوقف جهاز تحديد المواقع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>صورة &جغرافية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>&علاقة</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>أنشئ العلاقة</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&المساحة</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>إنشئ مساحة جديدة</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&محرر مختصر المفاتيح...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&حرّر...</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>إ&دمج...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
+        <location filename="../src/MainWindow.ui" line="1408"/>
         <source>&Save...</source>
         <translation>&إحفظ...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&حمّل...</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&أضف عضواً</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&أحذف العضو</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&طريق منحنية</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>قطّ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>الت&فضيلات...</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>ال&كلّ</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&دائماً</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>صدّر كلّ الطبقات الظاهرة إلى ملف</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&فكّ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>إ&بحث...</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>أفصل العقدة من الطريق</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>ابحث</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>أفصل عقدة من الطريق</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>إبحث و إختر بنود</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&عمل بدون إتصال</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&نافذة الرؤية</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>رسم</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>أ&زياء</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>أ&ضف...</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>أ&حذف...</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>إ&دمج</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>دمج العقد</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>أدمج العقد المختارة (ستبقى العقد المحددة أولاً)</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>إحفظ &كــ ...</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>آلة التصوير</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>إحف&ظ</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>إحفظ في ملف</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>إستدارة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>نزّل المزيد</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>نزّل المزيد من المعطيات للمنطقة الحالية</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>الميزات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&خصائص</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>ال&معلومات</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>إ&صطف</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>إصطف العقد</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>صفّ العقد المحددة في خط جالس. الأثنتين المختارة أولاً تعطيك الخط.</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>أغلِق</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>أعرض المساحات ال&منزلة</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>إ&نسخ</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>أنسخ الخصائص و الأوسمة المختارة إلى الحافظة</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>المختارة...</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>الخصائص...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>المقياس</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
+        <location filename="../src/MainWindow.ui" line="1824"/>
         <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
+        <location filename="../src/MainWindow.ui" line="1829"/>
         <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
+        <location filename="../src/MainWindow.ui" line="1844"/>
         <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
+        <location filename="../src/MainWindow.ui" line="1849"/>
         <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
+        <location filename="../src/MainWindow.ui" line="1854"/>
         <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
+        <location filename="../src/MainWindow.ui" line="1862"/>
         <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
+        <location filename="../src/MainWindow.ui" line="1865"/>
         <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
+        <location filename="../src/MainWindow.ui" line="1870"/>
         <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
+        <location filename="../src/MainWindow.ui" line="1875"/>
         <source>Download missing children</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>أحذف العضو '%1' على %2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>العلاقة المغييرة %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>المقياس</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>أنشئ عقدة في الطريق: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>ألصق</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>أنشئ المنطقة %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>المنطقة: أنشئ الطريق %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>أضف ثغرة.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>هل تريد إضافة فجوة (جديدة) إلى هذه المساحة ؟</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (ثناءي)</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>المنطقة: أنهي الطريق %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>أودع الخاصية في طبقة العمل</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>المنطقة: أضف العقدة %1 إلى الطريق %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>أضف العقدة إلى الطريق %1 المزدوجة الممرات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>أقلب شريط الأدوات</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>إطهار/إخفاء شريط الأدوات</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>إخفاء الكلّ</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>أعرض الكلّ</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>أنشء متعدد الأضلاع %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>&طبقة الصورة</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>إنشاء مستديرة %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>أنشئ العقدة %1 في الطريق %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>%1إنشاء الطريق :</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>أنشئ العقدة : %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>أضف العقدة %1 إلى الطريق %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>أحذف الميزة %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>أنقل العقد</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>أقل اعقدة %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>وجدتُ عقد على نفس الموقع.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>أدمج العقد إلى %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&إبدأ</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>إبدء تشغيل جهاز الــGPS</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&كرّر التشغيل</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&نطام العالمي لتحديد الموقع</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>إخفاء/عرض حاضن جهاز تحديد المواقع العالمي</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>&قفّ</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>تصميم تبادل الملفات (*.gpx) لجهاز تحديد المواقع العالمي
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>قِفّ  تشغيل جهاز الــGPS</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>تصميم المفات OpenStreetMap (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&حدّد المركز على جهاز النظام العالمي لتحديد الموقع</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>أعرض &قطع الأثر</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>أعرض ال&مقياس</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>مستند KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>أعر&ض العلاقات</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>ملف شكل ESRI  (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>أعرض خلفية الطرقات</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>أعرض حدود الطرقات</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>التنسيقات المتوفّرة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>سجِّل</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>مستند Merkaartor (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>كلّ الملفات (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>توقف</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>البلاطة %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>أوقف جهاز تحديد المواقع</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>صورة &جغرافية</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>منحفض</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>عالي</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>غير شفاف</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&محرر مختصر المفاتيح...</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>الخصوصية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>إ&دمج...</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>العقدة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&أضف عضواً</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>الطريق</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&أحذف العضو</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>العلاقة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>قطّ</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&دائماً</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&فكّ</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>ألغي</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>أفصل العقدة من الطريق</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>أفصل عقدة من الطريق</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&عمل بدون إتصال</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>رسم</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>أ&زياء</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPSجهاز تحديد المواقع العالمي</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>الطبقات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>الأدوات/العدة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>أغلِق</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>الحافظة غير صالحة</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>العلاقة المغييرة %1</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>أحذف العضو '%1' على %2</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>تناقضات غير محلولة</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>تغييرات غير محفوطة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>الرجاء حلّ التناقضات الموجودة أولاً</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
         <source>Waypoints</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
         <source>Track %1</source>
         <translation>الأثر %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>تحذيرمشدد عن حقوق المؤلف</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
         <source>No valid file</source>
         <translation>ملف غير صالح</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
         <source>%1 could not be opened.</source>
         <translation>لم أستطع فتح %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
         <source>Old Qt version detected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
         <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
 For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
         <source>Upload OSM</source>
         <translation>حمّل OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
 OpenStreetMap username and password.
 Do you want to do this now?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
         <source>Error downloading</source>
         <translation>خطأ عند التنزيل</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
         <source>The map could not be downloaded</source>
         <translation>لم أتمكن من تنزيل الخريطة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
         <source>Error downloading OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
         <source>The OpenStreetBugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>أنشء متعدد الأضلاع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>أضف أرقام شارع</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>حدد عدد الجوانب</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>ألصق الطرقات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>إفسخ الطرقات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>أفصل الطرقات</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>إحفظ زيّ الخريطة</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>حمّل زيّ الخريطة</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>إحفظ المستند Merkaartor</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>غير معنون</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>ملفات مستند  (*.mdc) Merkaartor</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>أضف أرقام شارع</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>كلّ الملفات (*)</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>غير قادر على فتح ملف الحفظ</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>إستحالة فتح %1 للكتابة.</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>الملف غير صحيح</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>ليس %1 مستند صالح من النوع Merkaartor</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>صدّر OSM</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>ملفات  (*.osm)OSM</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>صدّر  GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPX ملفات الــ (*.gpx)</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>صدّر KML</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KML الملفات (*.kml)</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>إسم الإشارة المرجعية غير صالح</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>إصطف العقد</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>لا تستطيع الإشارة المرجعية أن تكون خالية من التعبير.</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>خطء جهاز تحديد المواقع العالمي</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>أفصل العقدة %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>غير قادر على فتح منفذ جهاز تحديد المواقع العالمي.</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>أضف العضو إلى العلاقة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>أحذف العضو من العلاقة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>أضف ثغرة.</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>هل تريد إضافة فجوة (جديدة) إلى هذه المساحة ؟</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>إحفظ زيّ الخريطة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>حمّل زيّ الخريطة</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>إسقاط غير صالح</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>غير معنون</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>إحفظ المستند Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>آلة التصوير</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>ملفات مستند  (*.mdc) Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>غير قادر على فتح ملف الحفظ</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>إستحالة فتح %1 للكتابة.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>الملف غير صحيح</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>ليس %1 مستند صالح من النوع Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>صدّر OSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>أنشء متعدد الأضلاع %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>ملفات  (*.osm)OSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>صدّر  GPX</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>أنقل العقد</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPX ملفات الــ (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>أقل اعقدة %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>صدّر KML</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KML الملفات (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>أضف إشارة مرجعية</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>حدد إسم الإشارة المرجعية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>أنشء متعدد الأضلاع</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>إسم الإشارة المرجعية غير صالح</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>حدد عدد الجوانب</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>لا تستطيع الإشارة المرجعية أن تكون خالية من التعبير.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>تحذير: إسم الإشارة المرجعية موجود مسبقاً</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>أدخل واحداً جديداً، حافظ على الحالي للكتابة عليه أو ألغي.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>إزالة الإشارة المرجعية</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>إختر الإشارة المرجعية لحذفها.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>إستدارة</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>إسقاط غير صالح</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>خطء جهاز تحديد المواقع العالمي</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>غير قادر على فتح منفذ جهاز تحديد المواقع العالمي.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>الميزات</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>تناقضات غير محلولة</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>الرجاء حلّ التناقضات الموجودة أولاً</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>الأخيرt: </i><b>%1</b> by <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation><i>الأخير: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>size</source>
-        <translation>القياس</translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>members</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>الإحداثيات</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
-        <source>Topleft</source>
-        <translation>أعلى اليسار</translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>الوصف</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
-        <source>Botright</source>
-        <translation>أسفل اليمين</translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>التعليق</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
-        <source>Relation</source>
-        <translation>العلاقة</translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>العقدة</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
-        <source>Role</source>
-        <translation>الدور</translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>الإرتفاع</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
-        <source>Member</source>
-        <translation>العضو</translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>السرعة</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
-        <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>size</source>
+        <translation>القياس</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
-        <source>Length</source>
-        <translation>الطول</translation>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>members</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>Size</source>
-        <translation>القياس</translation>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
+        <source>Topleft</source>
+        <translation>أعلى اليسار</translation>
     </message>
     <message>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
         <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>%1 عقد</translation>
+        <source>Botright</source>
+        <translation>أسفل اليمين</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
+        <source>Relation</source>
+        <translation>العلاقة</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>المساحة</translation>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
+        <source>Role</source>
+        <translation>الدور</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>الإحداثيات</translation>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
+        <source>Member</source>
+        <translation>العضو</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>الإرتفاع</translation>
+        <location filename="../src/Features/Way.cpp" line="903"/>
+        <source>Closed way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>السرعة</translation>
+        <location filename="../src/Features/Way.cpp" line="906"/>
+        <source>Length</source>
+        <translation>الطول</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>Size</source>
+        <translation>القياس</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>الوصف</translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>%1 عقد</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>التعليق</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>المساحة</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>العقدة</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 م.</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 كلم</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 م.</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 كلم</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>الخادم الجديد</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>مرجعية جديدة</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>أنسخ مفتاح مقابل</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>أكثر من 150 تفضيلات</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>مرجعية جديدة</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>الخادم الجديد</translation>
     </message>
 </context>
 <context>
@@ -4790,17 +4806,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>الإسم</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>حقل غير معروف</translation>
     </message>
@@ -4813,24 +4829,9 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>خطأ!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>خطأ غير معروف.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4852,11 +4853,6 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4864,6 +4860,11 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4885,12 +4886,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
@@ -4905,12 +4906,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
@@ -4920,27 +4921,27 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4953,7 +4954,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="25"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="35"/>
@@ -4969,31 +4970,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>دائماً</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>محرّر أزياء الخريطة</translation>
@@ -5026,9 +5008,34 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>ثخانة نسبية</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>سماكة مثبتة</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
@@ -5059,12 +5066,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
         <source>Visible up to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
         <source>Visible from scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5074,31 +5081,6 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>لوّن بللون</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>ثخانة نسبية</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>سماكة مثبتة</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5118,7 +5100,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5128,17 +5110,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
         <source>Touchup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="981"/>
@@ -5153,7 +5135,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5188,7 +5170,26 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
         <source>Label with background tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>دائماً</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5196,48 +5197,53 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
         <source>No Valid geotag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
         <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
         <source>Load without associated node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
         <source>Extract info from barcode (Walking Papers)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
         <source>Ignore it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
         <source>Do this for all current photos.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>مربع الحوار</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5245,140 +5251,35 @@ What do you want to do next?</source>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVG ملفات (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>untitled</source>
         <translation>غير معنون</translation>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>كلّ الملفات (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation>ملفات الصور (*.png *.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>مربع الحوار</translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>دليل الأزياء المعتادة</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>قالب تسمية</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>الأدات موجودة مسبقاً</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>يوجد أداة بهذا الإسم مسبقاً.
-الرجاء إختيار إسم آخر أو الضغط على الزرّ <طبّق> إذا كنت تريد تغيير الموجود حالياً</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <source>SVG files (*.svg)</source>
+        <translation>SVG ملفات (*.svg)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>كلّ الملفات (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>إختر مجلد السجلّ</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation>ملفات الصور (*.png *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
         <source>Preferences</source>
         <translation>التفضيلات</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>الإعداد المحلي</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>قد تكون بحاجة إلى إعادة تشغيل البرنامج كي تحصل على التغييرات</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>إستعمل اللغة</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
         <source>Visual</source>
         <translation>مرئي</translation>
@@ -5399,11 +5300,6 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>غير شفافية منخفضة/عالية</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
         <translation>تفاعل فردي زرّ الفأرة</translation>
@@ -5411,7 +5307,27 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
         <source>Use custom Qt style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
@@ -5442,12 +5358,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
         <source>Overwrite style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>حوم</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5460,140 +5376,187 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>بكسلات</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>تبئير/تركيز</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>العلاقات</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>زيّ الخريطة</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>الزيّ الحالي</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>حوم</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>القالب</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>العلاقات</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>المدمج</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>تبئير/تركيز</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>المعتاد</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>تسليط الضوء</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>المعطيات</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>كلمة المرور:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>الإعداد المحلي</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>المستندات</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>قد تكون بحاجة إلى إعادة تشغيل البرنامج كي تحصل على التغييرات</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>إستعمل اللغة</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>زيّ الخريطة</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>دليل الأزياء المعتادة</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>الزيّ الحالي</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>القالب</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>قالب تسمية</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>المدمج</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>المعتاد</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>المعطيات</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>المستندات</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
@@ -5608,27 +5571,27 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
         <source>Automatically extract tracks on open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
         <source>Track layers readonly by default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
         <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5636,9 +5599,35 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>GPSجهاز تحديد المواقع العالمي</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>تسلسلي</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>المنفذ</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>المضيف</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
@@ -5661,9 +5650,14 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>إستعمل الوكيل</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>المضيف:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>كلمة المرور:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>المستخدم:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
@@ -5671,19 +5665,19 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>المنفذ:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>المضيف:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
         <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
@@ -5693,7 +5687,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
         <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
@@ -5713,7 +5707,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
@@ -5758,7 +5752,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
         <source>Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
@@ -5766,6 +5760,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>التشيكية</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
         <translation>الألمانية</translation>
@@ -5778,7 +5777,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
         <source>Hungarian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
@@ -5788,17 +5787,22 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
         <source>Japanese</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
         <source>Polish</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
         <source>Brazilian Portuguese</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
@@ -5806,95 +5810,86 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>روسي</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>المستخدم:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>تسليط الضوء</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>تسلسلي</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>المنفذ</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>المضيف</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>الأدات موجودة مسبقاً</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>يوجد أداة بهذا الإسم مسبقاً.
+الرجاء إختيار إسم آخر أو الضغط على الزرّ <طبّق> إذا كنت تريد تغيير الموجود حالياً</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>إختر مجلد السجلّ</translation>
     </message>
 </context>
 <context>
@@ -5902,17 +5897,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="14"/>
         <source>Projections setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="20"/>
         <source>Projections</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="47"/>
         <source>Projection list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="76"/>
@@ -5922,7 +5917,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="93"/>
         <source>PROJ4 string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
@@ -5947,7 +5942,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5955,7 +5950,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5968,40 +5963,40 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6035,6 +6030,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>الخصائص - عناصر متعددة</translation>
     </message>
     <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
         <translation>الخصائص - طريق</translation>
@@ -6053,7 +6053,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
@@ -6070,38 +6070,10 @@ Please select another name or click the <Apply> button if you want to modi
         <source>Select member</source>
         <translation>إختر العضو</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>ألغي</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>تنظيف شلالي</translation>
@@ -6111,13 +6083,13 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/Commands/FeatureCommands.cpp" line="74"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="188"/>
         <source>Set Tag '%1=%2' on %3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="314"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="400"/>
         <source>Clear Tag '%1' on %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/NodeCommands.cpp" line="17"/>
@@ -6127,9 +6099,32 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>حرّك العقدة %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>ألغي</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportNGT.cpp" line="21"/>
@@ -6137,31 +6132,31 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>إسيراد NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>إستورد NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6177,14 +6172,14 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6214,7 +6209,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6225,32 +6220,32 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>خطء في سجل جهاز تحديد المواقع العالمي</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>خطء في سجل جهاز تحديد المواقع العالمي</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6264,7 +6259,7 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="22"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="29"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="63"/>
@@ -6328,98 +6323,142 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/NameFinder/xmlstreamreader.cpp" line="45"/>
         <source>Not a proper results stream!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>أحذف</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>مُوافق</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>تطبيق</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>ألغي</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6437,7 +6476,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
@@ -6455,17 +6494,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6493,17 +6532,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6547,19 +6586,19 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>الإسم</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>المعرف</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>المعرف</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6573,12 +6612,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>أغلِق</translation>
     </message>
@@ -6602,6 +6641,16 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>إرفع إلى Openstreetmap</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>الرجاء إعادة النظر في التغييرات المرسلة إلى أو.أس.أم</translation>
@@ -6616,23 +6665,13 @@ Please select another name or click the <Apply> button if you want to modi
         <source>Cancel</source>
         <translation>ألغي</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>إرفع إلى Openstreetmap</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
         <source>TMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="20"/>
@@ -6657,21 +6696,21 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="111"/>
         <source>Get Services</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="133"/>
         <source>Services :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="143"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
@@ -6679,44 +6718,44 @@ p, li { white-space: pre-wrap; }
         <translation>الإسقاط:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
@@ -6734,27 +6773,21 @@ p, li { white-space: pre-wrap; }
         <translation>أحذف</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>لا يمكن ترك العنوان و الدرب فارغاً.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>فشل التنزيل: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6785,17 +6818,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
         <source>AND</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6805,12 +6838,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6834,111 +6867,111 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
         <source>For example "1-9;15-17;19,19A"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
         <source>All numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>إستخرج - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 كلم</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>إستخرج - %1</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>إستخرج طبقة الرسم</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>التكبير</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>أغلِق</translation>
     </message>
@@ -6978,17 +7011,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7037,12 +7070,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>التكبير</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>محو</translation>
     </message>
@@ -7050,38 +7083,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>لا يمكن ترك العنوان و الدرب فارغاً.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>فشل التنزيل: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>خطأ عند قرائة القدرات.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="20"/>
@@ -7099,53 +7103,63 @@ p, li { white-space: pre-wrap; }
         <translation>الإسم :</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>Url الخادم :</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>الطبقات:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>الإسقاط:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>الأزياء:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>الإسقاط:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
         <source>Zoom levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>الأزياء:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7163,14 +7177,33 @@ p, li { white-space: pre-wrap; }
         <translation>أحذف</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>Url الخادم :</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>لا يمكن ترك العنوان و الدرب فارغاً.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>خطأ عند قرائة القدرات.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>فشل التنزيل: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_cs.ts b/translations/merkaartor_cs.ts
index 91013a3..13300af 100644
--- a/translations/merkaartor_cs.ts
+++ b/translations/merkaartor_cs.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="cs">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,151 +24,181 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Copyright Bart Vanhauwaert, Chris Browet a ostatní, 2006-2012</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Tento program je šířen pod licencí GNU Public License v2</translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska a další, 2006-2015</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Tento program je šířen pod licencí GNU General Public License v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Seznam změn</translation>
     </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
 </context>
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Zkratky</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Import</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Export</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Výchozí</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Editor zkratek</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Nahrát schéma zkratek</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Merkaartor soubor zkratek (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Nemohu otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 nemohl být otevřen.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Uložit soubor Zkratek</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>nepojmenovaný</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Nemohu otevřít uložený soubor</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 nemůže být otevřen pro zápis.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation>Stavitel mostů</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation>Bohužel, z tohoto neumím postavit most. Prosím, označ pouze dva body.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation>Přeměnit segment na most</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation>Zvolený úsek již je označen jako most/tunel.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation>Nepodporovaná akce: Most není složen pouze z jedné cesty.</translation>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -181,9 +209,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CreateDoubleWayDock</name>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="40"/>
-        <source>Distance between two roads</source>
-        <translation>Vzdálenost mezi cestami</translation>
+        <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="13"/>
+        <source>Form</source>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="25"/>
@@ -191,44 +219,45 @@ p, li { white-space: pre-wrap; }
         <translation>Jízda v pravo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="13"/>
-        <source>Form</source>
-        <translation>Form</translation>
+        <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="40"/>
+        <source>Distance between two roads</source>
+        <translation>Vzdálenost mezi cestami</translation>
     </message>
 </context>
 <context>
     <name>CreateRoundaboutDock</name>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="25"/>
-        <source>Driving at the right side of the road</source>
-        <translation>Jízda v pravo</translation>
-    </message>
-    <message>
         <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="13"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
+    <message>
+        <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="25"/>
+        <source>Driving at the right side of the road</source>
+        <translation>Jízda v pravo</translation>
+    </message>
 </context>
 <context>
     <name>DirtyDock</name>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation><b>Žádné</b> změněné objekty.</translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation><b>Jeden</b> změněný objekt.</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
+        <source>Undo</source>
+        <translation>Historie změn</translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="195"/>
@@ -240,11 +269,6 @@ p, li { white-space: pre-wrap; }
         <source>Center && Zoom map</source>
         <translation>Vystředit && přiblížit mapu</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
-        <source>Undo</source>
-        <translation>Historie změn</translation>
-    </message>
 </context>
 <context>
     <name>DirtyDockWidget</name>
@@ -258,9 +282,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -271,7 +295,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Přiblížení</translation>
     </message>
@@ -279,12 +303,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyListExecutor</name>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="342"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="537"/>
-        <source>ADD relation %1</source>
-        <translation>Přidat vazbu %1</translation>
-    </message>
-    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="326"/>
         <location filename="../src/Sync/DirtyList.cpp" line="570"/>
         <source>ADD road %1</source>
@@ -297,32 +315,34 @@ p, li { white-space: pre-wrap; }
         <translation>Přidat traťový bod %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
-        <source>CLOSE changeset</source>
-        <translation>Zavřít soubor změn</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="342"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="537"/>
+        <source>ADD relation %1</source>
+        <translation>Přidat relaci %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="423"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="430"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="446"/>
-        <source>Error uploading request</source>
-        <translation>Chyba při nahrávání</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="350"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="701"/>
+        <source>UPDATE trackpoint %1</source>
+        <translation>Aktualizovat traťový bod %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
-        <source>OPEN changeset</source>
-        <translation>Otevřít soubor změn</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="358"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="639"/>
+        <source>UPDATE relation %1</source>
+        <translation>Upravit relaci %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="424"/>
-        <source>Please check your username and password in the Preferences menu</source>
-        <translation>Prosím zkontrolujte svoje uživatelské jméno a heslo v menu Předvolby</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="366"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="670"/>
+        <source>UPDATE road %1</source>
+        <translation>Aktualizovat cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="390"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="788"/>
-        <source>REMOVE relation %1</source>
-        <translation>Odebrat vazbu %1</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="374"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="734"/>
+        <source>REMOVE trackpoint %1</source>
+        <translation>Odebrat traťový bod %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="382"/>
@@ -331,10 +351,22 @@ p, li { white-space: pre-wrap; }
         <translation>Odebrat cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="374"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="734"/>
-        <source>REMOVE trackpoint %1</source>
-        <translation>Odebrat traťový bod %1</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="390"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="788"/>
+        <source>REMOVE relation %1</source>
+        <translation>Odebrat relaci %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="423"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="430"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="446"/>
+        <source>Error uploading request</source>
+        <translation>Chyba při nahrávání</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="424"/>
+        <source>Please check your username and password in the Preferences menu</source>
+        <translation>Prosím zkontrolujte svoje uživatelské jméno a heslo v menu Předvolby</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="427"/>
@@ -345,24 +377,6 @@ Server message is '%2'</source>
 Hlášení serveru je '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="358"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="639"/>
-        <source>UPDATE relation %1</source>
-        <translation>Upravit vazbu %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="366"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="670"/>
-        <source>UPDATE road %1</source>
-        <translation>Aktualizovat cestu %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="350"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="701"/>
-        <source>UPDATE trackpoint %1</source>
-        <translation>Aktualizovat traťový bod %1</translation>
-    </message>
-    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
         <source>
 API message is '%1'</source>
@@ -372,7 +386,17 @@ Hlášení API je '%1'</translation>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="464"/>
         <source>Uploading changes...</source>
-        <translation>Zasílám změny...</translation>
+        <translation>Nahrávám změny...</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
+        <source>OPEN changeset</source>
+        <translation>Otevřít soubor změn</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
+        <source>CLOSE changeset</source>
+        <translation>Zavřít soubor změn</translation>
     </message>
 </context>
 <context>
@@ -408,7 +432,7 @@ Hlášení API je '%1'</translation>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
@@ -428,7 +452,7 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="354"/>
         <source>ADD relation %1</source>
-        <translation>Přidat vazbu %1</translation>
+        <translation>Přidat relaci %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="368"/>
@@ -443,7 +467,7 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="399"/>
         <source>UPDATE relation %1</source>
-        <translation>Upravit vazbu %1</translation>
+        <translation>Upravit relaci %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="414"/>
@@ -468,116 +492,121 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="470"/>
         <source>REMOVE relation %1</source>
-        <translation>Odebrat vazbu %1</translation>
+        <translation>Odebrat relaci %1</translation>
     </message>
 </context>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>nepojmenovaný</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Pracovní</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
-        <translation>Data odeslané na server</translation>
+        <translation>Data odeslaná na server</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Zobrazování pozadí</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadMapDialog</name>
     <message>
-        <location filename="../src/common/DownloadMapDialog.ui" line="112"/>
-        <source>Also download raw GPS tracks</source>
-        <translation>Stáhnout také GPS tratě</translation>
+        <location filename="../src/common/DownloadMapDialog.ui" line="14"/>
+        <source>Download</source>
+        <translation>Stáhnout</translation>
+    </message>
+    <message>
+        <location filename="../src/common/DownloadMapDialog.ui" line="32"/>
+        <source>Location</source>
+        <translation>Umístění</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="40"/>
         <source>Bookmark</source>
-        <translation>Záložka</translation>
+        <translation>Oblíbené</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="62"/>
@@ -585,14 +614,14 @@ Please redownload the problematic feature to handle the conflict.</source>
         <translation>Aktuální pohled</translation>
     </message>
     <message>
-        <location filename="../src/common/DownloadMapDialog.ui" line="14"/>
-        <source>Download</source>
-        <translation>Stáhnout</translation>
+        <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
+        <source>WWW link (OSM/Google maps)</source>
+        <translation>Z WWW adresy (OSM/GoogleMaps/Mapy.cz)</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -600,113 +629,86 @@ Please redownload the problematic feature to handle the conflict.</source>
         <translation>Z mapy (mapu poskytuje projekt OpenStreetMap)</translation>
     </message>
     <message>
-        <location filename="../src/common/DownloadMapDialog.ui" line="32"/>
-        <source>Location</source>
-        <translation>Umístění</translation>
-    </message>
-    <message>
-        <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
-        <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/DownloadMapDialog.ui" line="112"/>
+        <source>Also download raw GPS tracks</source>
+        <translation>Stáhnout také GPS logy</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="119"/>
         <source>Resolve all relations</source>
-        <translation>Vyřešit všechny vazby</translation>
+        <translation>Stáhnout všechny prvky relací</translation>
     </message>
 </context>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Konflikty s %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>nemohu stáhnout více</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Stahování selhalo</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Stahování z OSM (připojování)</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 staženo</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Stahuji traťové body %1-%2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Stahování nevyřešených...</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Stahuji %1,%2 (přiblížení %3)...</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Stáhnout nevyřešené %1 z %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>chyba</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Analyzuji nevyřešené %1 z %2</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>Analyzuji XML</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Vyřešte prosím nejprve existující konflikty</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Nevyřešené konflikty</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Zpracovávám...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Neplatné uživatelské jméno/heslo</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>Zpracovávám XML</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Stažené tratě - uzly %1-%2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Konflikty s %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 staženo</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Nalezeny prázdné cesty/relace</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Stáhnout nevyřešené %1 z %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Prázné cesty/relace jsou nejspíše chyba.
+Chcete je označit pro smazání?</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Analyzuji nevyřešené %1 z %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Odebrat prázné vlastnosti %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
-        <translation>Detekován konflikt</translation>
+        <translation>Byly nalezeny konflikty</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
@@ -715,169 +717,179 @@ Vlastnost byla duplikovaná jako "conflict_..." ve vrstvě "Konfl
 Dříve než budete moci odeslat vaše změny, musíte ručně sloučit dvě verze a odebrat jednu z vrstvy "Konflikty...".</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Detekovány prázdné cesty/vazby</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Nahrávám...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Prázné cesty/vazby jsou pravděpodobně chyba.
-Chcete je označit pro smazání?</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Odebrat prázné vlastnosti %1</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Čekám na odpověď serveru</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>chyba</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Stahování z OSM (%n B)</numerusform>
-            <numerusform>Stahování z OSM (%n B)</numerusform>
-            <numerusform>Stahování z OSM (%n B)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Stahování z OSM (%n kB)</numerusform>
-            <numerusform>Stahování z OSM (%n kB)</numerusform>
-            <numerusform>Stahování z OSM (%n kB)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Stahuji...</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Stahuji z OSM (připojování)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation>Neočekávaný http stavový kód (%1)
 Hlášení serveru je '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 Hlášení API je '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Stahování selhalo</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
-    </message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Neplatné uživatelské jméno/heslo</translation>
+    </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Stáhni body</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Nevyřešené konflikty</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Stahuji...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Vyřešte prosím nejprve existující konflikty</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Zpracovávám...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Stahuji traťové body %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Stahování nevyřešených...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Stažené tratě - uzly %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation>MapDust</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Stahnuji body</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Stahuji %1,%2 (přiblížení %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Zavřít</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Přiblížení</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Zavřít</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze smazat</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation>Označené objekty nelze smazat, protože jsou mimo staženou oblast.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze smazat vše</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation>Všechny označené objekty nelze smazat, protože jsou mimo staženou oblast.
+Smazat vše, co smazat lze?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Změnit směr cesty %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation>Změnit směr %1 cest</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="../src/ImportExport/ExportDialog.ui" line="38"/>
-        <source>All visible (i.e. not hidden)</source>
-        <translation>Vše viditelné (t.j. né skryté)</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="13"/>
         <source>Export</source>
         <translation>Export</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ExportDialog.ui" line="52"/>
-        <source>Selected</source>
-        <translation>Vybrané</translation>
+        <location filename="../src/ImportExport/ExportDialog.ui" line="25"/>
+        <source>What do you want to export?</source>
+        <translation>Co chcete exportovat?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportDialog.ui" line="38"/>
+        <source>All visible (i.e. not hidden)</source>
+        <translation>Vše viditelné (t.j. né skryté)</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="45"/>
@@ -885,9 +897,9 @@ Delete what can be?</source>
         <translation>Zobrazení</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ExportDialog.ui" line="25"/>
-        <source>What do you want to export?</source>
-        <translation>Co chcete exportovat?</translation>
+        <location filename="../src/ImportExport/ExportDialog.ui" line="52"/>
+        <source>Selected</source>
+        <translation>Vybrané</translation>
     </message>
 </context>
 <context>
@@ -913,6 +925,11 @@ Delete what can be?</source>
         <translation>Stáhnout chybějící objekty</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Přidat k výběru</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Odstranit</translation>
@@ -920,7 +937,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="442"/>
         <source>Relations</source>
-        <translation>Vazby</translation>
+        <translation>Relace</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="443"/>
@@ -937,11 +954,6 @@ Delete what can be?</source>
         <source>All</source>
         <translation>Vše</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Přidat k výběru</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -958,12 +970,12 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation>Najít...</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -981,7 +993,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="30"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
@@ -992,7 +1004,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
@@ -1002,17 +1014,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="47"/>
         <source>Filter list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="76"/>
@@ -1022,7 +1034,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="93"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
@@ -1048,547 +1060,449 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Nemohu načíst informace o fotografii ze serveru Walking Papers.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Geo obrázky</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Vystředit mapu</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
+        <source>Remove Images</source>
+        <translation>Odebrat obrázky</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
+        <source>Copy filename to clipboard</source>
+        <translation>Kopírovat název souboru do schránky</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Vyber další obrázek</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>PgDown</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Vyber předchozí obrázek</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>PgUp</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Nahrát geotagovaný obrázek</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>Vyberte vrstvu ke které náleží obrázek:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Vrstva je pouze pro čtení</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zvolená vrstva je pouze pro čtení. Mám změnit</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Nahrávám obrázek...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Zrušit nahrávání</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>Žádný takový soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>Nemohu najít obrázek "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>Chyba při otevírání "%2":
+%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Chyba při nahrávání EXIF-dat z "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation>Zadejte offset</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation>Pozice obrázku více k:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>konec tratě</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>začátek tratě</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Žádné body cesty</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Žádné body cesty pro obrázek "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'sekund'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'minut a' ss 'sekund'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'hodin,' mm 'minut a' ss 'sekund'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>Špatný obrázek?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Obrázek "%1" byl pořízen %2 dříve než byl zaznamenán další traťový bod.
 Chcete ho ještě používat?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Obrázek "%1" byl pořízen %2 až po zaznamenáni posledního traťového bodu.
 Chcete ho ještě používat?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
-        <source>Remove Images</source>
-        <translation>Odebrat obrázky</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation>JPEG Obrázky (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Nemohu načíst informace o fotografii ze serveru Walking Papers.</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <source>Error while opening "%1":
+%2</source>
+        <translation>Chyba při otvírání "%1":
+%2</translation>
     </message>
+</context>
+<context>
+    <name>GotoDialog</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/GotoDialog.ui" line="14"/>
+        <source>Go To</source>
+        <translation>Jít na</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/GotoDialog.ui" line="28"/>
+        <source>Bookmark</source>
+        <translation>Záložka</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Vystředit mapu</translation>
+        <location filename="../src/common/GotoDialog.ui" line="61"/>
+        <source>WWW link (OSM/Google maps)</source>
+        <translation>Z WWW adresy (OSM/GoogleMaps/Mapy.cz)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
-        <source>Copy filename to clipboard</source>
-        <translation>Kopírovat název souboru do schránky</translation>
+        <location filename="../src/common/GotoDialog.ui" line="80"/>
+        <source>Coordinates</source>
+        <translation>Souřadnice</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/GotoDialog.ui" line="92"/>
+        <source>Show projected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/GotoDialog.ui" line="107"/>
+        <source>lonMin, latMin, lonMax, latMax</source>
+        <translation>délkaMin, šířkaMin, délkaMax, šířkaMax</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>Žádný takový soubor</translation>
+        <location filename="../src/common/GotoDialog.ui" line="134"/>
+        <source>latCent, lonCent, latSpan, lonSpan</source>
+        <translation>šířkaCent, délkaCent, šířkaSpan, délkaSpan</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>Nemohu najít obrázek "%1".</translation>
+        <location filename="../src/common/GotoDialog.ui" line="156"/>
+        <source>Info</source>
+        <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
+        <location filename="../src/common/GotoDialog.ui" line="176"/>
+        <source>OSM API Url</source>
+        <translation>OSM API Url</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>Chyba při otevírání "%2":
-%1</translation>
+        <location filename="../src/common/GotoDialog.ui" line="203"/>
+        <source>OSM XAPI url</source>
+        <translation>OSM XAPI url</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Žádné body cesty</translation>
+        <location filename="../src/common/GotoDialog.ui" line="225"/>
+        <location filename="../src/common/GotoDialog.ui" line="244"/>
+        <source>Search</source>
+        <translation>Hledat</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Žádné body cesty pro obrázek "%1"</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Neplatné OSM url</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation>JPEG Obrázky (*.jpg)</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>Zadané url je neplatné!</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Chyba při nahrávání EXIF-dat z "%1".</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Nesprávný formát souřadnic</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Souřadnice musí být: '<levá délka>, <dolní šířka>, <pravá délka>, <horní šířka>'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <source>Error while opening "%1":
-%2</source>
-        <translation>Chyba při otvírání "%1":
-%2</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Souřadnice musí být: '<střední šířka>, <střední délka>, <rozsah šířky>, <rozsah délky>'</translation>
     </message>
+</context>
+<context>
+    <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Vyber další obrázek</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>PgDown</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Vyber předchozí obrázek</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>PgUp</translation>
-    </message>
-</context>
-<context>
-    <name>GotoDialog</name>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Neplatné OSM url</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>Zadané url je neplatné!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Nesprávný formát souřadnic</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Souřadnice musí být: '<levá délka>, <dolní šířka>, <pravá délka>, <horní šířka>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Souřadnice musí být: '<střední šířka>, <střední délka>, <rozsah šířky>, <rozsah délky>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="14"/>
-        <source>Go To</source>
-        <translation>Jít na</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="28"/>
-        <source>Bookmark</source>
-        <translation>Záložka</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="61"/>
-        <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="80"/>
-        <source>Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="92"/>
-        <source>Show projected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="107"/>
-        <source>lonMin, latMin, lonMax, latMax</source>
-        <translation>délkaMin, šířkaMin, délkaMax, šířkaMax</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="134"/>
-        <source>latCent, lonCent, latSpan, lonSpan</source>
-        <translation>šířkaCent, délkaCent, šířkaSpan, délkaSpan</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="156"/>
-        <source>Info</source>
-        <translation>Informace</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="176"/>
-        <source>OSM API Url</source>
-        <translation>OSM API Url</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="203"/>
-        <source>OSM XAPI url</source>
-        <translation>OSM XAPI url</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="225"/>
-        <location filename="../src/common/GotoDialog.ui" line="244"/>
-        <source>Search</source>
-        <translation>Hledat</translation>
-    </message>
-</context>
-<context>
-    <name>ImageLayerWidget</name>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>[ Shape] adaptér</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
-        <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
+        <source>Zoom</source>
+        <translation>Přiblížení</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
-        <source>WMS adapter</source>
-        <translation>WMS adaptér</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
+        <source>Set view projection to layer's</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
-        <source>TMS adapter</source>
-        <translation>TMS adaptér</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
+        <source>Reset alignment adjustment</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
-        <source>Zoom</source>
-        <translation>Přiblížení</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
-        <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
+        <source>WMS adapter</source>
+        <translation>WMS adaptér</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
-        <source>Close</source>
-        <translation>Zavřít</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
+        <source>TMS adapter</source>
+        <translation>TMS adaptér</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Mapa - prázdná</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
-        <source>Map - TMS - %1</source>
-        <translation>Mapa - TMS - %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Mapa - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Mapa - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Mapa - WMS-Dlaždice - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
+        <source>Map - TMS - %1</source>
+        <translation>Mapa - TMS - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Mapa - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Velikost dlaždice</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Celé číslo</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Zeměpisná délka</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Zeměpisná šířka</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Neplatná projekce</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Neplatný soubor</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 nemohl být otevřen.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 není CSV soubor s nastavením</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>nepojmenovaný</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Všechny soubory (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 nemůže být otevřen pro zápis.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
@@ -1596,14 +1510,14 @@ Do you really want to exit?</source>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
         <source>Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1611,22 +1525,22 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
         <source>Specifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
         <source>First line contains headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
@@ -1636,27 +1550,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
         <source>Colon (,)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="131"/>
         <source>Semicolon (;)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="138"/>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="145"/>
         <source>Other:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1666,37 +1580,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
         <source>Projection (in PROJ4 format; leave blank for latitude/longitude)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="227"/>
         <source>Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="254"/>
         <source>Field list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
         <source>Field Type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="310"/>
@@ -1711,85 +1625,164 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="342"/>
         <source>From (0 from start):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="352"/>
         <source>To (0 to End):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="367"/>
         <source>Load settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="374"/>
         <source>Save settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Celé číslo</translation>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
-        <translation>Informace</translation>
-    </message>
-</context>
-<context>
-    <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n objekt</numerusform>
-            <numerusform>%n objekty</numerusform>
-            <numerusform>%n objektů</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
-        <translation>Rozměr</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Zeměpisná délka</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
-        <translation>Objekty</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Zeměpisná šířka</translation>
     </message>
-</context>
-<context>
-    <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Vrstvy</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Neplatná projekce</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Vše</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>Tratě</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Neplatný soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 nemohl být otevřen.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 není CSV soubor s nastavením</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>nepojmenovaný</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Všechny soubory (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 nemůže být otevřen pro zápis.</translation>
+    </message>
+</context>
+<context>
+    <name>ImportExportGdal</name>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InfoDock</name>
+    <message>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation>Informace</translation>
+    </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation>Rozměr</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
+        <translation>Objekty</translation>
     </message>
+</context>
+<context>
+    <name>LayerDock</name>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
@@ -1810,7 +1803,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="260"/>
         <source>Readonly None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="267"/>
@@ -1818,78 +1811,93 @@ p, li { white-space: pre-wrap; }
         <translation>Zavřít</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Vrstvy</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Vše</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation>Podklad</translation>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
+        <translation>Pracovní</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>Tratě</translation>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
-        <source>High</source>
-        <translation>Vysoké</translation>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
+        <source>Visible</source>
+        <translation>Viditelná</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
+        <source>Readonly</source>
+        <translation>Pouze pro čtení</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Nízké</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
-        <source>Opacity</source>
-        <translation>Krytí</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
+        <source>High</source>
+        <translation>Vysoké</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Neprůhledné</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
-        <source>Visible</source>
-        <translation>Viditelná</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
-        <source>Readonly</source>
-        <translation>Pouze pro čtení</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
+        <source>Opacity</source>
+        <translation>Krytí</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1897,17 +1905,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1921,2901 +1929,2920 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Nahrávám pluginy...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Inicializace...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Nápověda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&O aplikaci</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Vytvořit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Přidat...</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Cesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Přidat záložku</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Upravit</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Zobrazení</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Přidány uzly do dvojité cesty %1</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Záložky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Zarovnat</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Nastavit &projekci</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Zarovnat Uzly</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Nastavit prů&hlednost oblasti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Zarovnat vybrané uzly. První dva vybrané definují dráhu.</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Soubor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Vše...</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Export</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Naposledy &otevřené</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Naposledy &importované</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>&Nástroje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Styl</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Oblast</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Uzel</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Oblast: Přidán uzel %1 do cesty %2</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Okno</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Oblast: Vytvořena cesta %1</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Doky</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Oblast: Ukončena cesta %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>&Vlastnosti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Záložka nemůže být prázdná.</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Záložky</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Vrstvy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>R&ozpojit</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Cesty přerušeny</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>&Relace</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Zrušen klíč '%1' on %2</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Špatný obsah schránky</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Zobrazit &směrové šipky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Převést vybrané vlastnosti z pomocných vrstev (např. Traťě nebo Extrakt) do pracovní vrstvy, připravit pro zaslání</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Kopírovat vybrané značky vlastností do schránky; jestliže je vlastností traťový bod, zkopírovat taky jeho souřadnice.</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Ukončit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Vytvořit</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&O aplikaci</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Vytvořit nový dokument</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Otevřít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
+        <location filename="../src/MainWindow.ui" line="419"/>
         <source>Create a new document and import a file</source>
         <translation>Vytvořit nový dokument a importovat soubor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Vytvořena oblast %1</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Vytvořena dvojitá cesta %1</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Zobrazit &vše</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Vytvořit odkaz</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Vytvořen uzel v cestě: %1</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Zobrazit &výběr</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Zobrazit výběr</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Vytvořen uzel %1 v cestě %2</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Vytvořena vazba %1</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>&Oddálit</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Vytvořena cesta: %1</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Vytvořen kruhový objezd %1</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>&Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Křivky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Zpět</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Vpřed</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Přesunout</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="531"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Import</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importovat soubor do aktuálního dokumentu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Stáhnout</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Stáhnout mapové data pro novou oblast</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Odkaz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Vytvořit odkaz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Vybrat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Nahrát</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Nahrát změny na server</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Křivky</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>&Odebrat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Curved road</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Vyjmout vybrané vlastnosti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
+        <location filename="../src/MainWindow.ui" line="620"/>
         <source>Del</source>
         <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Doky</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Vytvoit novou cestu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Silnice se středním pásem</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Stáhnout více</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Vytvořit nový uzel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Stáhnout aktuální pohled do předchozí stažené vrstvy</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Upravit</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Změnit směr</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Vložte nové, ponechte stávající pro přepsání nebo zrušte akci.</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Obrátit směr cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Chyba stahování</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Jít na...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Exportovat všechny viditelné vrstvy do souboru</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Silnice se středním pásem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Exportovat GPX</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Vytvořit silnici se středním pásem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exportovat KML</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Exportovat OSM</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Vytvořit kruhový objezd</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Exportovat prvky ze zobrazení do souboru</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Nový</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Soubor</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Vytvořit nový dokument</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Najít...</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Rozdělit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Najít a označit položky</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Rozdelit cestu na oddělené (připojené) cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Spojit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Sloučit připojené cesty na jednu cestu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPX Soubory (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Nápověda</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>R&ozpojit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Skrýt/zobrazit dialog Informace</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Přerušit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Skrýt/zobrazit dialog Vrstev</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Oddělit připojené cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Skrýt/Zobrazit dialog Vlastnosti</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Skrýt/Zobrazit dialog Historie</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>&Relace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Import</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Vytvořit relaci</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importovat soubor do aktuálního dokumentu</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Oblast</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Neplatné jméno záložky</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Vytvořit novou oblast</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Neplatný soubor</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Upravit...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Je vřele doporučeno uložit změny do vašeho dokumentu po uploadu.
-Chcete to udělat hned?</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Uložit &jako...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Spojit</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Nahrát...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Cesty spojeny</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Curved road</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Předvolby...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KML Soubory (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Vše...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Exportovat všechny viditelné vrstvy do souboru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Odkaz</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Najít...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Nahrát mapový styl</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Najít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Spojit</translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Najít a označit položky</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Sloučit Uzly do %1</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Zobrazení...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Spojit vybrané uzly (první vybraný zůstane zachován)</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Exportovat prvky ze zobrazení do souboru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Sloučit značky ve schránce s jednou vybranou vlastností.</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Přidat...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Odebrat...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Soubory Merkaartor documents (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Spojit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Merkaartor mapový styl (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Sloučení uzlů</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Nový</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Spojit vybrané uzly (první vybraný zůstane zachován)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Uzel</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Neplatný soubor</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Uložit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Detekována stará verze Qt</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Uložit do souboru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Otevřít</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binární)</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Stáhnout více</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>OSM Soubory (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Stáhnout více mapových dat pro stávající oblast</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Stáhnout aktuální pohled do předchozí stažené vrstvy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Vložit (a přepsat) značky ve schránce na vybranou vlastnost.</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Vložit vlastnosti do schránky; pokud je id vlastnosti již v dokumentu, přepsat jej.</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Vlastnosti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Vyřešte prosím nejprve existující konflikty</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Skrýt/Zobrazit dialog Vlastnosti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Předvolby...</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Ukončit</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Skrýt/zobrazit dialog Vrstev</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Vpřed</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>&Vazba</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Informace</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Změněna vazba %1</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Skrýt/zobrazit dialog Informace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>&Odebrat</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Odebrat...</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Zarovnat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Odebrat záložku</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Zarovnat uzly</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Zarovnat vybrané uzly. První dva vybrané definují dráhu.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Vyjmuta značka %1</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Skrýt/Zobrazit dialog Historie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Změnit směr</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Cesta</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Ukaž &staženou oblast</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Uložit</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Uložit &jako...</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Kopírovat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Uložit mapový styl</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Kopírovat vybrané vlastnosti a klíče do schránky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Uložit dokument Merkaartoru</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Kopírovat vybrané značky vlastností do schránky; jestliže je vlastností traťový bod, zkopírovat taky jeho souřadnice.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Vybrané...</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Vyberte záložku k odebrání.</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Vložit klíč (&přepsat)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Nastavit &projekci</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Vložit (a přepsat) značky ve schránce na vybranou vlastnost.</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Nastaveny klíče na  %1</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Zadejte jméno záložky.</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Rozdělit</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Cesty rozděleny</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Styl</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>Aktuální mapa obsahuje neuložené změny, které budou ztraceny, pokud se otevře nová.
-Chcete zrušit vytváření nové mapy nebo pokračovat a zahodit staré změny?</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Mapa nemohla být stáhnuta</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Zpět</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>Nevyřešené konflikty</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Neuložené změny</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>nepojmenovaný</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Odeslat OSM</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Zobrazení</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Zobrazení...</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Varování: Jméno záložky už existuje</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Okno</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Vypadá to, že jste ještě nezadali vaše
-OpenStreetMap  uživatelské jméno a heslo.
-Chcete to udělat nyní?</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Vaše nastavení používá Qt %1, které obsahuje různé známe chyby v odesílání dat do OpenStreetMap, vedoucích k chybovému hlášení serveru 401. Jste si jisti, že chcete pokračovat (což není doporučené).
-Pro více informací navštivte http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Zobrazit &vše</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Přiblížit</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>&Přiblížit</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>&Oddálit</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Zobrazit &výběr</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Zobrazit výběr</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 nemohl být otevřen.</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Vložit klíč (&sloučit)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 není platný dokument Merkaartoru.</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Vložit klíče</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Vytvořit uzel: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Vložit klíče ze schránky (Sloučit s existujícími klíči)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Přidán uzel %1 do cesty %2</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Sloučit značky ve schránce s jednou vybranou vlastností.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>dlaždice %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Vybrané...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Vlastnosti...</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Vložit objekt(y)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Waypoint</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Trať %1</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Vložit vlastnosti ze schránky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Vložit vlastnosti do schránky; pokud je id vlastnosti již v dokumentu, přepsat jej.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binární)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>chyba GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Vynutit nahrání</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Nemohu otevřít GPS port.</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Převést vlastnosti do pracovní vrstvy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Otevřít NMEA log soubor</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Převést vybrané vlastnosti z pomocných vrstev (např. Traťě nebo Extrakt) do pracovní vrstvy, připravit pro zaslání</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Vrstvy</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Ukaž &staženou oblast</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
+        <location filename="../src/MainWindow.ui" line="1166"/>
         <source>Toggle Toolbar</source>
         <translation>Panel nástrojů</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
         <source>Hide/Show the Toolbar</source>
         <translation>Skrýt/zobrazit dialog Panel nástrojů</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
+        <location filename="../src/MainWindow.ui" line="1177"/>
         <source>Hide All</source>
         <translation>Skrýt vše</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
+        <location filename="../src/MainWindow.ui" line="1185"/>
         <source>Show All</source>
         <translation>Ukázat vše</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
+        <location filename="../src/MainWindow.ui" line="1196"/>
         <source>&Image layer</source>
         <translation>&Obrázky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1212"/>
         <source>Ctrl+Alt+P</source>
         <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1223"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
+        <location filename="../src/MainWindow.ui" line="1228"/>
         <source>&Start</source>
         <translation>&Start</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Spustit GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1236"/>
         <source>&Replay...</source>
         <translation>&Přehrát...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Skrýt/Zobrazit dialog GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Přehrát GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Skrýt/Zobrazit dialog GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
+        <location filename="../src/MainWindow.ui" line="1264"/>
         <source>S&top</source>
         <translation>S&top</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Zastavit GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1275"/>
         <source>&Center on GPS</source>
         <translation>&Vystředit podle GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
+        <location filename="../src/MainWindow.ui" line="1283"/>
         <source>Show track &segments</source>
         <translation>Zobrazit traťové &segmenty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
+        <location filename="../src/MainWindow.ui" line="1286"/>
         <source>Ctrl+Alt+T</source>
         <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
+        <location filename="../src/MainWindow.ui" line="1294"/>
         <source>Show &scale</source>
         <translation>Zobraz &měřítko</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
+        <location filename="../src/MainWindow.ui" line="1297"/>
         <source>Ctrl+Alt+S</source>
         <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
+        <location filename="../src/MainWindow.ui" line="1305"/>
         <source>Show &relations</source>
-        <translation>Zobraz &vazby</translation>
+        <translation>Zobraz &relace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
+        <location filename="../src/MainWindow.ui" line="1308"/>
         <source>Ctrl+Alt+R</source>
         <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
+        <location filename="../src/MainWindow.ui" line="1316"/>
         <source>Show roads background</source>
         <translation>Zobraz pozadí cest</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
+        <location filename="../src/MainWindow.ui" line="1324"/>
         <source>Show roads boundary</source>
         <translation>Zobraz okraje cest</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
+        <location filename="../src/MainWindow.ui" line="1332"/>
         <source>Show touchup</source>
         <translation>Zobraz dotyk</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
         <source>Record</source>
         <translation>Záznam</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Nahrávat GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1360"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Pozastavit GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoObrázky</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
         <source>Hide/Show the GeoImage dock</source>
         <translation>Skrýt/zobrazit dialog GeoObrázky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
+        <location filename="../src/MainWindow.ui" line="1380"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Nemohu otevřít uložený soubor</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Světový OSB manažer...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 nemůže být otevřen pro zápis.</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>Editor &zkratek...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Nalezeny uzly na stejné pozici.</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Spojit...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Chcete sloučit všechny uzly na [drop] pozici?</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Uložit...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Nízké</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Přidat prvek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Vysoké</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Odebrat prvek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Neprůhledné</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Nikdy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>pro &jednosměrné cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Vždy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>O&dpojit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Odpojit uzel od cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Odpojit uzel od cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>Pracovat O&ffline</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Vrstvy</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Styly</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Značky</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Skrýt/zobrazit dialog Stylů</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Uzel</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Cesta</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>Editor &WMS Serverů...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Vazba</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>Editor &TMS Serverů..</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>GPS Exchange formát (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>OpenStreetMap formát (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>GPS Menu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Fotoaparát</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Noni GPSPlot formát (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Vytvořit &křižovatku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>NMEA GPS log formát (*.nmea *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Otočit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>KML soubor (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Oddělený čárkou (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Geotaggované obrázky (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>ESRI Shapefile (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation>Přida novou &podkladovou vrstvu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Objekty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Přidat číslování &ulice (Karlsruhe schéma)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Merkaartor dokument (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Podrozdělit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Cesta</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Načíst obrázek</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Přidat pozici uzlu do obrázku</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Zobrazit &virtuální uzly</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Zobrazit mřížku zeměpisné šířky/délky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>&Zamknout zvětšení k dlaždicím pozadí</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Nástroje</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>Editor &projekcí</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Schránka neobsahuje platná data</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Big Fat Copyright Warning</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Pokoušíte se importovat KML soubor. Prosím uvědomte si že: 
-- Nemůžete importovat do OSM soubor KML vytvořený v Google Earth. 
-I když si myslíte, že uzly které jste vytvořili v GE jsou vaše, nejsou! 
-Je to pouze odvozené dílo z GE a jako takové nemůže být použité v OSM. 
-
- - Pokud jste ho stáhli z internetu, je velká pravděpodobnost, že je zatížen copyrightem. 
-Prosím buďte si absolutně jisti, že použití těchto dat v OSM je povoleno autorem, 
-nebo že tyto data jsou public domain.
-
-Pokud si nejste jisti , prosím požádejte o radu v "legal" nebo "talk" openstreetmap mailing listu. Jste si opravdu absolutně jisti, že tento KLM může být legálně importován do OSM?</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>Editor &filtrů...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>Žád&ný</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>Rozdělit obla&st</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>&Terasa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Chyba při zavírání chyby</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Nemohu smazat chybu. Zpráva serveru je:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Přidat číslování ulic</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>&Tisk...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Vlastnosti...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>Měřítko</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Odpojit uzel %1</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Přidat prvek do vazby</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Odebrat prvek z vazby</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Podporované formáty</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Stáhnout chybějící objekty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Všechny soubory (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Zrušen klíč '%1' on %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Smaž %1 tagů na %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Odebrat prvek '%1' z %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Uložit šablonu značek</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Změněna relace %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Merkaartor šablona značek (*.mat)</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Otevřít šablonu značek</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Vytvořen uzel v cestě: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Zobrazit &směrové šipky</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Vytvořena oblast %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Nastavit prů&hlednost oblasti</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Oblast: Vytvořena cesta %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Export</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Přidat otvor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Naposledy &otevřené</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Přidat (další) otvor do této oblasti?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Naposledy &importované</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Oblast: Ukončena cesta %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>&Nástroje</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Oblast: Přidán uzel %1 do cesty %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>&Vlastnosti</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Přidány uzly do dvojité cesty %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>&Vazba</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Vytvořena dvojitá cesta %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Přesunout</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Stáhnout</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Vytvořit polygon %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Stáhnout mapové data pro novou oblast</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Vybrat</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Vytvořen kruhový objezd %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Odeslat</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Zaslat změny na server</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Vytvořen uzel %1 v cestě %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Vyjmout vybrané vlastnosti</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Vytvořena cesta: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Vytvoit novou cestu</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Vytvořit uzel: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Vytvořit nový uzel</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Přidán uzel %1 do cesty %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Obrátit směr cesty</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Jít na...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Vytvořit silnici se středním pásem</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Vytvořit kruhový objezd</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Rozdelit cestu na oddělené (připojené) cesty</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Vyjmuta značka %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Sloučit připojené cesty na jednu cestu</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Přerušit</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Smazat potomky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Oddělit připojené cesty</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Vytvořit vazbu</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Vytvořit novou oblast</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Upravit...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>Levý-clik pro výběr; Levý-drag pro posunutí</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Uložit...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Nahrát...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Přesunout uzly</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Posunout nod %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Najít</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Nalezeny uzly na stejné pozici.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Sloučení uzlů</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Chcete sloučit všechny uzly na [drop] pozici?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Uložit do souboru</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Sloučit Uzly do %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Stáhnout více mapových dat pro stávající oblast</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Vlastnosti</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informace</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Zarovnat uzly</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>Levý-click na první roh -> Levý-drag pro výběr oblasti -> Levý-clik pro zvětšení</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopírovat</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Kopírovat vybrané vlastnosti a klíče do schránky</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>GPS Exchange formát (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Vložit klíč (&přepsat)</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>OpenStreetMap formát (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Vložit klíč (&sloučit)</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Vložit klíče</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Noni GPSPlot formát (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Vložit klíče ze schránky (Sloučit s existujícími klíči)</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>NMEA GPS log formát (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Vložit</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>KML soubor (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Vložit vlastnosti ze schránky</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Oddělený čárkou (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Převést vlastnosti do pracovní vrstvy</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Geotaggované obrázky (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>ESRI Shapefile (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Spustit GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Podporované formáty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Přehrát GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Merkaartor dokument (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>dlaždice %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Zastavit GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Nemohu nahrát soubory projekce</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Nahrávat GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projections.xml" nemůže být otevřen kdekoliv. Ruším .</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Pozastavit GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Nízké</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eoObrázky</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Vysoké</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Světový OSB manažer...</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Neprůhledné</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>Editor &zkratek...</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Značky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Spojit...</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Uzel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Přidat prvek</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Odebrat prvek</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nikdy</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Načíst obrázek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>pro &jednosměrné cesty</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Přidat pozici uzlu do obrázku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Vždy</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>O&dpojit</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Odpojit uzel od cesty</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Odpojit uzel od cesty</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>Pracovat O&ffline</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Styly</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Skrýt/zobrazit dialog Stylů</translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>Editor &WMS Serverů...</translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Vrstvy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>Editor &TMS Serverů..</translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Nástroje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Přidat číslování &ulice (Karlsruhe schéma)</translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Podrozdělit</translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Špatný obsah schránky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Schránka neobsahuje platná data</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>&Zamknout zvětšení k dlaždicím pozadí</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Neuložené změny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>Editor &projekcí</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>Aktuální mapa obsahuje neuložené změny, které budou ztraceny, pokud se otevře nová.
+Chcete zrušit vytváření nové mapy nebo pokračovat a zahodit staré změny?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Waypoint</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Trať %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Big Fat Copyright Warning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Pokoušíte se importovat KML soubor. Prosím uvědomte si že: 
+- Nemůžete importovat do OSM soubor KML vytvořený v Google Earth. 
+I když si myslíte, že uzly které jste vytvořili v GE jsou vaše, nejsou! 
+Je to pouze odvozené dílo z GE a jako takové nemůže být použité v OSM. 
+
+ - Pokud jste ho stáhli z internetu, je velká pravděpodobnost, že je zatížen copyrightem. 
+Prosím buďte si absolutně jisti, že použití těchto dat v OSM je povoleno autorem, 
+nebo že tyto data jsou public domain.
+
+Pokud si nejste jisti , prosím požádejte o radu v "legal" nebo "talk" openstreetmap mailing listu. Jste si opravdu absolutně jisti, že tento KLM může být legálně importován do OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Neplatný soubor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 nemohl být otevřen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Detekována stará verze Qt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Vaše nastavení používá Qt %1, které obsahuje různé známe chyby v odesílání dat do OpenStreetMap, vedoucích k chybovému hlášení serveru 401. Jste si jisti, že chcete pokračovat (což není doporučené).
+Pro více informací navštivte http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Stáhnout chybějící objekty</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Odeslat OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Zavřít</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Vypadá to, že jste ještě nezadali vaše
+OpenStreetMap  uživatelské jméno a heslo.
+Chcete to udělat nyní?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Chyba stahování</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Mapa nemohla být stáhnuta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>Editor &filtrů...</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>Žád&ný</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Vytvořit polygon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Uveďte počet stran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>Rozdělit obla&st</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Cesty spojeny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Cesty rozděleny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Cesty přerušeny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>&Terasa</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Vynutit odeslání objektu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Chyba při zavírání chyby</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Nemohu smazat chybu. Zpráva serveru je:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Vytvořit křižovatku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>&Tisk...</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Vícenásobné křížení</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Tyto cesty mají vícenásobné křížení.
+Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou být smazány ručně)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Přidat číslování ulic</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>Měřítko</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Odebrat prvek '%1' z %2</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Přidat otvor</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Přidat (další) otvor do této oblasti?</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Nemohu nahrát soubory projekce</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>"Projections.xml" nemůže být otevřen kdekoliv. Ruším .</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Vytvořit křižovatku</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Neplatná projekce</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Nemohu nastavit projekci "%1".</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Zarovnat Uzly</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Odpojit uzel %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>GPS Menu</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Přidat prvek do relace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Fotoaparát</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Odebrat prvek z relace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Vytvořit &křižovatku</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Smazat potomky</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Nastavit vlastnosti na</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Vytvořena relace %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Uložit mapový styl</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Merkaartor mapový styl (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Vytvořit polygon %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Nahrát mapový styl</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Edituj vazby</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Přesunout uzly</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Posunout nod %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>nepojmenovaný</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>Levý-clik pro výběr; Levý-drag pro posunutí</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Uložit dokument Merkaartoru</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Soubory Merkaartor documents (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Nemohu otevřít uložený soubor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 nemůže být otevřen pro zápis.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>Levý-click na první roh -> Levý-drag pro výběr oblasti -> Levý-clik pro zvětšení</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Neplatný soubor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Vytvořit polygon</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 není platný dokument Merkaartoru.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Uveďte počet stran</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Exportovat OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Vynutit odeslání objektu</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>OSM Soubory (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Vynuceně odeslat</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Otočit</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Exportovat GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Vícenásobné křížení</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPX Soubory (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Tyto cesty mají vícenásobné křížení.
-Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou být smazány ručně)?</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Exportovat KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Vložit objekt(y)</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KML Soubory (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Objekty</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Zobrazit &virtuální uzly</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Smaž %1 tagů na %2</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Přidat záložku</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
-    </message>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Zadejte jméno záložky.</translation>
+    </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Neplatné jméno záložky</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Záložka nemůže být prázdná.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Varování: Jméno záložky už existuje</translation>
     </message>
-</context>
-<context>
-    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
-        <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Vložte nové, ponechte stávající pro přepsání nebo zrušte akci.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Oblast</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Odebrat záložku</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
-        <source>Botright</source>
-        <translation>Pravý dolní</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Vyberte záložku k odebrání.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>komentář</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Neplatná projekce</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>Souřadnice</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Nemohu nastavit projekci "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>popis</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>chyba GPS</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>elevace</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Nemohu otevřít GPS port.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>poslední: </i><b>%1</b></translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Otevřít NMEA log soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Uložit šablonu značek</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Merkaartor šablona značek (*.mat)</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Otevřít šablonu značek</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Nevyřešené konflikty</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Vyřešte prosím nejprve existující konflikty</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Je vřele doporučeno uložit změny do vašeho dokumentu po uploadu.
+Chcete to udělat hned?</translation>
+    </message>
+    <message>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Nastavit vlastnosti na</translation>
+    </message>
+    <message>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Nastaveny klíče na  %1</translation>
     </message>
+</context>
+<context>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>poslední: </i><b>%1</b> by <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>poslední: </i><b>%1</b></translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
-        <source>Length</source>
-        <translation>Délka</translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Waypoint</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
-        <source>Member</source>
-        <translation>Člen</translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>Souřadnice</translation>
     </message>
     <message>
         <location filename="../src/Features/Node.cpp" line="379"/>
         <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Uzel</translation>
+        <source>description</source>
+        <translation>popis</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>members</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>komentář</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
-        <source>Relation</source>
-        <translation>Vazba</translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Uzel</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
-        <source>Role</source>
-        <translation>Úloha</translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>elevace</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>rychlost</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>rozměr</translation>
     </message>
     <message>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>members</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
+        <source>Topleft</source>
+        <translation>Levý horní</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
         <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>Size</source>
-        <translation>Rozměr</translation>
+        <source>Botright</source>
+        <translation>Pravý dolní</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>rychlost</translation>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
+        <source>Relation</source>
+        <translation>Relace</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
-        <source>Topleft</source>
-        <translation>Levý horní</translation>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
+        <source>Role</source>
+        <translation>Úloha</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Cesta</translation>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
+        <source>Member</source>
+        <translation>Člen</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Waypoint</translation>
+        <location filename="../src/Features/Way.cpp" line="903"/>
+        <source>Closed way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>%1 uzlů</translation>
+        <location filename="../src/Features/Way.cpp" line="906"/>
+        <source>Length</source>
+        <translation>Délka</translation>
     </message>
-</context>
-<context>
-    <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>Size</source>
+        <translation>Rozměr</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
-        <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>%1 uzlů</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
-        <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Oblast</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Cesta</translation>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="384"/>
         <source>%1 m</source>
         <translation>%1 m</translation>
     </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
+        <source>View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <source>Bounding Box</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
+        <source>Projection</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Nový server</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Nová záložka</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Upload předvoleb selhal</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Duplicitní klíč</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Více jak 150 předvoleb</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Nová záložka</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Nový server</translation>
     </message>
 </context>
 <context>
     <name>MultiProperties</name>
     <message>
-        <location filename="../src/common/MultiProperties.ui" line="53"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../src/common/MultiProperties.ui" line="13"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/common/MultiProperties.ui" line="73"/>
-        <source>Selected items</source>
-        <translation>Vybrané položky</translation>
-    </message>
-    <message>
         <location filename="../src/common/MultiProperties.ui" line="33"/>
         <source>Tags</source>
         <translation>Značky</translation>
     </message>
+    <message>
+        <location filename="../src/common/MultiProperties.ui" line="53"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MultiProperties.ui" line="73"/>
+        <source>Selected items</source>
+        <translation>Vybrané položky</translation>
+    </message>
 </context>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Neznámé pole</translation>
     </message>
@@ -4828,25 +4855,10 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <translation>Chyba!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Hostitel jmenné vyhledávací služby nebyl nalezen.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Hostitel jmenné vyhledávací služby odmítl spojení.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Jmenná vyhledávací služba vyžaduje ověření.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Neznámá chyba.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4867,11 +4879,6 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4879,6 +4886,11 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4900,12 +4912,12 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
@@ -4920,12 +4932,12 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
@@ -4935,27 +4947,27 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4968,7 +4980,7 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="25"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="35"/>
@@ -4984,12 +4996,28 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
+        <source>Map style editor</source>
+        <translation>Editor mapového stylu</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
+        <source>Global</source>
+        <translation>Globální</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
+        <source>Background</source>
+        <translation>Pozadí</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="96"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="273"/>
@@ -5006,44 +5034,19 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
-        <source>Add</source>
-        <translation>Přidat</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Vždy</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
-        <source>Dashed</source>
-        <translation>Čárkovaná</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
-        <source>Draw icon</source>
-        <translation>Vykreslovat ikonu</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
-        <source>Fill area</source>
-        <translation>Vyplnit oblast</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Proporcionální tloušťka</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
@@ -5056,31 +5059,14 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <translation>Pevná tloušťka</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
-        <source>Map style editor</source>
-        <translation>Editor mapového stylu</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
-        <source>meter/pixel</source>
-        <translation>metr/pixel</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
-        <source>off</source>
-        <translation>vypnuto</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
+        <source>Filter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Proporcionální tloušťka</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
@@ -5088,14 +5074,20 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <translation>Odstranit</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
+        <source>Duplicate</source>
+        <translation>Duplikát</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
         <source>Tag selection</source>
         <translation>Výběr značky</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
-        <source>Visible from scale</source>
-        <translation>Viditelný od zvětšení</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
+        <source>meter/pixel</source>
+        <translation>metr/pixel</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
@@ -5103,37 +5095,38 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <translation>Viditelný do</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
-        <source>Duplicate</source>
-        <translation>Duplikát</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
+        <source>Visible from scale</source>
+        <translation>Viditelný od zvětšení</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
-        <source>Background</source>
-        <translation>Pozadí</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="775"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1347"/>
+        <source>Draw with color</source>
+        <translation>Kreslit s barvou</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
+        <source>Dashed</source>
+        <translation>Čárkovaná</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
+        <source>off</source>
+        <translation>vypnuto</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="775"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1347"/>
-        <source>Draw with color</source>
-        <translation>Kreslit s barvou</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
+        <source>Fill area</source>
+        <translation>Vyplnit oblast</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5143,12 +5136,12 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5161,9 +5154,14 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <translation>Kreslící krok</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
+        <source>Draw icon</source>
+        <translation>Vykreslovat ikonu</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5181,6 +5179,16 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <translation>Label tag</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
+        <source>Halo</source>
+        <translation>Text nad</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
+        <source>Area</source>
+        <translation>Oblast</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
         <translation>Kreslit s barvou pozadí</translation>
@@ -5191,19 +5199,23 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <translation>Označit se značkou pozadí</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
-        <source>Global</source>
-        <translation>Globální</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
-        <source>Halo</source>
-        <translation>Text nad</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Vždy</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
-        <source>Area</source>
-        <translation>Oblast</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5222,12 +5234,12 @@ Chcete pro každou vytvořit křižovatku (Nežádoucí křižovatky pak mohou b
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
         <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
@@ -5253,6 +5265,11 @@ What do you want to do next?</source>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5266,6 +5283,11 @@ What do you want to do next?</source>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>SVG souboru (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
         <translation>Všechny soubory (*)</translation>
@@ -5275,490 +5297,473 @@ What do you want to do next?</source>
         <source>Image files (*.png *.jpg)</source>
         <translation>Obrazkové soubory  (*.png *.jpg)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVG souboru (*.svg)</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
-        <source>Automatically extract tracks on open</source>
-        <translation>Automaticky extrahovat tratě při otevření</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
+        <source>Preferences</source>
+        <translation>Předvolby</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
-        <source>Autosave documents after upload</source>
-        <translation>Automatické uložení dokumentu po odeslání</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
+        <source>Visual</source>
+        <translation>Zobrazení</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Obraz pozadí</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
+        <source>General</source>
+        <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Vestavěný</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
+        <source>Zoom Out/in (%)</source>
+        <translation>Přiblížit/oddálit (%)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
-        <translation>Adresář pro cache</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
+        <source>Opacity low/high</source>
+        <translation>Průhlednost nízká/vysoká</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Velikost cache (v Mb; 0 pro vypnutí)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
+        <source>Single mouse button interaction</source>
+        <translation>Odezva jednotlačítkové myši</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Uživatelský</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
+        <source>Use custom Qt style</source>
+        <translation>Použít uživatelský QT styl</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Data</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Vypnout styly pro traťovou dráhu</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Mód odděleného posunu</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Dokumenty</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Použít virtuální uzly (je vyžadováná nová session)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
-        <source>General</source>
-        <translation>Obecné</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Hostitel:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
+        <source>Colors</source>
+        <translation>Barvy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
-        <translation>Mapový adaptér</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
+        <source>Background</source>
+        <translation>Pozadí</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Mapový styl</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Síť</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
+        <source>Overwrite style</source>
+        <translation>Přepsat styl</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
-        <source>Opacity low/high</source>
-        <translation>Průhlednost nízká/vysoká</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>GPX trať</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Heslo:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
+        <source>Pixels</source>
+        <translation>Pixelů</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation>Port:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Použít jednoduchý vzhled GPX  tratě</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
-        <source>Preferences</source>
-        <translation>Předvolby</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Rozhraní</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Nastavení Proxy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Výběr</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
-        <source>Tracks</source>
-        <translation>Tratě</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Relace</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Použít Proxy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Zaměření</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
-        <source>Visual</source>
-        <translation>Zobrazení</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Zvýraznění</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
-        <source>Zoom Out/in (%)</source>
-        <translation>Přiblížit/oddálit (%)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Poloha</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Nástroj již existuje</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Pro projevení změn musíte restartovat program</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Nástroj s tímto jménem již existuje.
-Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže ho chcete změnit</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Použít jazyk</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Nemohu smazat nastavený nástroj</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Překládat standardní značky</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Nemohu smazat nastavený nástroj "%1"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
+        <source>Rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Nemohu změnit nastavené jméno nástroje</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
+        <source>Options</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Nemohu změnit nastavené jméno nástroje "%1"'</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
+        <source>Use Anti-aliasing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Vyberte spustitelný nástroj</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
+        <source>Disable Anti-alisaing while panning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
+        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
+        <source>Use current style for wireframe rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Vyberte adresář pro Logy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
+        <source>Editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Poloha</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
+        <source>Quick editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Pro projevení změn musíte restartovat program</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
+        <source>Wireframe editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Použít jazyk</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
+        <source>Full render editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Překládat standardní značky</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Mapový styl</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
-        <source>Colors</source>
-        <translation>Barvy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Adresář uživatelských stylů</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
-        <source>Background</source>
-        <translation>Pozadí</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Součastný styl</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Výběr</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Vypnout styly pro traťovou dráhu</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Zaměření</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Šablona</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Vazby</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Šablona značek</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Vestavěný</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Uživatelský</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation>OSM API (URL je například "http://www.openstreetmap.org/api/0.6"</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Dokumenty</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
-        <source>Save NMEA log</source>
-        <translation>Uložit NMEA log</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation>Nastavit systémový čas podle GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
+        <source>Autosave documents after upload</source>
+        <translation>Automatické uložení dokumentu po odeslání</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>Zapni JOSM-kompatibilní lokální server na portu 8111</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
+        <source>Tracks</source>
+        <translation>Tratě</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
-        <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
+        <source>Automatically extract tracks on open</source>
+        <translation>Automaticky extrahovat tratě při otevření</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
-        <source>Tools</source>
-        <translation>Nástroje</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
+        <source>Track layers readonly by default</source>
+        <translation>Vrstva [track ] je defaultně pouze pro čtení</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
-        <source>Name:</source>
-        <translation>Jméno:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
+        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
+        <translation>Nespojujte GPX uzly oddělené více jak (km; 0 pro vypnutí)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
-        <source>Path:</source>
-        <translation>Cesta:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
-        <source>Apply</source>
-        <translation>Použít</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
-        <source>Add</source>
-        <translation>Přidat</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
-        <source>Remove</source>
-        <translation>Odstranit</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>GPS vstup</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Adresář uživatelských stylů</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Šablona značek</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Seriový port</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartor šablona značek (*.mat)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Mód odděleného posunu</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Počítač</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
-        <source>Single mouse button interaction</source>
-        <translation>Odezva jednotlačítkové myši</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
+        <source>Save NMEA log</source>
+        <translation>Uložit NMEA log</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
-        <source>Use custom Qt style</source>
-        <translation>Použít uživatelský QT styl</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation>Nastavit systémový čas podle GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
-        <source>Overwrite style</source>
-        <translation>Přepsat styl</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation>Síť</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
-        <source>Pixels</source>
-        <translation>Pixelů</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation>Nastavení Proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
-        <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation>Použít Proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
-        <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Uživatel:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
-        <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
-        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Hostitel:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
-        <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
-        <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation>Zapni JOSM-kompatibilní lokální server na portu 8111</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
-        <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation>Obraz pozadí</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
-        <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation>Caching dlaždic (není aktivní pro Yahoo! - omezené použití)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
-        <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation>Adresář pro cache</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Součastný styl</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation>Velikost cache (v Mb; 0 pro vypnutí)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Šablona</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation>Mapový adaptér</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
+        <source>Automatically add "source" tag when creating features over a background map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
-        <source>Track layers readonly by default</source>
-        <translation>Vrstva [track ] je defaultně pouze pro čtení</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
+        <source>Tools</source>
+        <translation>Nástroje</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
-        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation>Nespojujte GPX uzly oddělené více jak (km; 0 pro vypnutí)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
+        <source>Name:</source>
+        <translation>Jméno:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
+        <source>Path:</source>
+        <translation>Cesta:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
+        <source>Apply</source>
+        <translation>Použít</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Caching dlaždic (není aktivní pro Yahoo! - omezené použití)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
@@ -5773,7 +5778,7 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
         <source>Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
@@ -5781,6 +5786,11 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Čeština</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Holandština</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
         <translation>Němčina</translation>
@@ -5793,7 +5803,7 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
         <source>Hungarian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
@@ -5803,7 +5813,7 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
         <source>Japanese</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
@@ -5811,75 +5821,19 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Polština</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Portugalština</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
         <source>Brazilian Portuguese</source>
         <translation>Brazilská portugalština</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Ruština</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Uživatel:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Zvýraznění</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>GPX trať</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Použít jednoduchý vzhled GPX  tratě</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>GPS vstup</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Seriový port</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Počítač</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Použít virtuální uzly (je vyžadováná nová session)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Holandština</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Portugalština</translation>
+        <source>Russian</source>
+        <translation>Ruština</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
@@ -5902,14 +5856,66 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Ukrajinština</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartor šablona značek (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Rozhraní</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Nástroj již existuje</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Nástroj s tímto jménem již existuje.
+Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže ho chcete změnit</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Nemohu smazat nastavený nástroj</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Nemohu smazat nastavený nástroj "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Nemohu změnit nastavené jméno nástroje</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Nemohu změnit nastavené jméno nástroje "%1"'</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Vyberte spustitelný nástroj</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Vyberte adresář pro Logy</translation>
     </message>
 </context>
 <context>
@@ -5917,17 +5923,17 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="14"/>
         <source>Projections setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="20"/>
         <source>Projections</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="47"/>
         <source>Projection list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="76"/>
@@ -5937,7 +5943,7 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="93"/>
         <source>PROJ4 string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
@@ -5962,7 +5968,7 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5970,7 +5976,7 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5983,40 +5989,40 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6030,20 +6036,19 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
 <context>
     <name>PropertiesDock</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
-        <source>Center map</source>
-        <translation>Vystředit mapu</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
+        <source>%1/%1 selected item(s)</source>
+        <translation>%1/%1 vybraných položek</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
-        <source>Center && Zoom map</source>
-        <translation>Vystředit && přiblížit mapu</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
+        <source>%1/%2 selected item(s)</source>
+        <translation>%1/%2 vybraných položek</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
-        <source>Properties</source>
-        <translation>Vlastnosti</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
+        <source>Selected items</source>
+        <translation>Vybrané položky</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
@@ -6051,9 +6056,9 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Vlastnosti - Vícenásobné prvky</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
-        <source>Properties - Relation</source>
-        <translation>Vlastnosti - Vztahy</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Vlastnosti - Uzel</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
@@ -6061,62 +6066,40 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Vlastnosti - Cesta</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
-        <source>Selected items</source>
-        <translation>Vybrané položky</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
-        <source>%1/%1 selected item(s)</source>
-        <translation>%1/%1 vybraných položek</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
+        <source>Properties - Relation</source>
+        <translation>Vlastnosti - Vztahy</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
-        <source>%1/%2 selected item(s)</source>
-        <translation>%1/%2 vybraných položek</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
+        <source>Properties</source>
+        <translation>Vlastnosti</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
+        <source>Center map</source>
+        <translation>Vystředit mapu</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
+        <source>Center && Zoom map</source>
+        <translation>Vystředit && přiblížit mapu</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
         <source>Select member</source>
         <translation>Vybrat prvek</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Vlastnosti - Uzel</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Postupný úklid</translation>
@@ -6142,9 +6125,32 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Přesunut uzel %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportNGT.cpp" line="21"/>
@@ -6152,31 +6158,31 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Importovat NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importovat NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6192,14 +6198,14 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6212,6 +6218,11 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>km/h</translation>
     </message>
     <message>
+        <location filename="../src/GPS/qgps.cpp" line="147"/>
+        <source>Unavailable</source>
+        <translation>Nedostupný</translation>
+    </message>
+    <message>
         <location filename="../src/GPS/qgps.cpp" line="153"/>
         <source>2D</source>
         <translation>2D</translation>
@@ -6224,28 +6235,23 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
-    <message>
-        <location filename="../src/GPS/qgps.cpp" line="147"/>
-        <source>Unavailable</source>
-        <translation>Nedostupný</translation>
-    </message>
 </context>
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>GPS chyba logování</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Nemohu vytvořit GPS log soubor: %1.</translation>
     </message>
@@ -6253,17 +6259,17 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>GPS chyba logování</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Nemohu vytvořit GPS log soubor: %1.</translation>
     </message>
@@ -6349,104 +6355,140 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< O D D Ě L O V A Č ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Použít</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< O D D Ě L O V A Č ></translation>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RelationProperties</name>
+    <name>QuaGzipFile</name>
     <message>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
         <source>Form</source>
@@ -6460,7 +6502,15 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
@@ -6470,32 +6520,32 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RoadProperties</name>
     <message>
-        <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
+        <location filename="../src/Docks/MinimumRoadProperties.ui" line="34"/>
+        <source>xxx</source>
+        <translation>xxx</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="41"/>
         <source>Id</source>
         <translation>Id</translation>
@@ -6508,22 +6558,22 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/MinimumRoadProperties.ui" line="34"/>
-        <source>xxx</source>
-        <translation>xxx</translation>
+        <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -6537,9 +6587,9 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
 <context>
     <name>SelectionDialog</name>
     <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="45"/>
-        <source>=</source>
-        <translation>=</translation>
+        <location filename="../src/Utils/SelectionDialog.ui" line="14"/>
+        <source>Selection</source>
+        <translation>Výběr</translation>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="25"/>
@@ -6547,9 +6597,14 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Klíč</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
-        <source>Query</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/SelectionDialog.ui" line="32"/>
+        <source>Value</source>
+        <translation>Hodnota</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="45"/>
+        <source>=</source>
+        <translation>=</translation>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="55"/>
@@ -6557,24 +6612,19 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="14"/>
-        <source>Selection</source>
-        <translation>Výběr</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="32"/>
-        <source>Value</source>
-        <translation>Hodnota</translation>
-    </message>
-    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
+        <source>Query</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6588,12 +6638,12 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
@@ -6615,22 +6665,7 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     </message>
 </context>
 <context>
-    <name>SyncListDialog</name>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="73"/>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="66"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
-        <source>Please review carefully the changes sent to OSM</source>
-        <translation>Prosím důkladně zkontrolujte změny zasílané do OSM</translation>
-    </message>
+    <name>SyncListDialog</name>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
         <source>Upload to Openstreetmap</source>
@@ -6641,18 +6676,43 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
         <source>Please specify a comment for this changeset.</source>
         <translation>Prosím specifikujte komentář pro tyto změny</translation>
     </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
+        <source>Please review carefully the changes sent to OSM</source>
+        <translation>Prosím důkladně zkontrolujte změny zasílané do OSM</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="66"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="73"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="296"/>
-        <source>Add</source>
-        <translation>Přidat</translation>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
+        <source>TMS servers setup</source>
+        <translation>Nastavení TMS serverů</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
-        <source>Apply</source>
-        <translation>Použít</translation>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="20"/>
+        <source>TMS Servers</source>
+        <translation>TMS Servery</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="47"/>
+        <source>Server list:</source>
+        <translation>Seznam serverů:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="78"/>
+        <source>Name:</source>
+        <translation>Jméno:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="99"/>
@@ -6662,21 +6722,26 @@ Prosím vyberte jiné jméno nebo použíjte <Apply> tlačítko, jetliže
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="111"/>
         <source>Get Services</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="133"/>
         <source>Services :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="143"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
+        <source>Projection:</source>
+        <translation>Projekce:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
@@ -6691,82 +6756,61 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
         <source>Origin is bottom-left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="78"/>
-        <source>Name:</source>
-        <translation>Jméno:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
-        <source>Projection:</source>
-        <translation>Projekce:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="303"/>
-        <source>Remove</source>
-        <translation>Odstranit</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="47"/>
-        <source>Server list:</source>
-        <translation>Seznam serverů:</translation>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
+        <source>Apply</source>
+        <translation>Použít</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="20"/>
-        <source>TMS Servers</source>
-        <translation>TMS Servery</translation>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="296"/>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
-        <source>TMS servers setup</source>
-        <translation>Nastavení TMS serverů</translation>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="303"/>
+        <source>Remove</source>
+        <translation>Odstranit</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Adresa a cesta nemůže být prázdná.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Stahování selhalo: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Chyba při načítání služeb
@@ -6776,11 +6820,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagModel</name>
     <message>
-        <location filename="../src/common/TagModel.h" line="22"/>
-        <source>Edit this to add...</source>
-        <translation>Editovat pro přidání...</translation>
-    </message>
-    <message>
         <location filename="../src/common/TagModel.cpp" line="105"/>
         <source>Key</source>
         <translation>Klíč</translation>
@@ -6790,6 +6829,11 @@ p, li { white-space: pre-wrap; }
         <source>Value</source>
         <translation>Hodnota</translation>
     </message>
+    <message>
+        <location filename="../src/common/TagModel.h" line="22"/>
+        <source>Edit this to add...</source>
+        <translation>Editovat pro přidání...</translation>
+    </message>
 </context>
 <context>
     <name>TagSelectorWidget</name>
@@ -6801,7 +6845,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
@@ -6811,7 +6855,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6821,12 +6865,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6850,126 +6894,121 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
         <source>For example "1-9;15-17;19,19A"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
         <source>All numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Extrahovat - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation># traťových segmentů</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Celková vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Celkové trvání</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Extrahovat - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
-        <source>Close</source>
-        <translation>Zavřít</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Extrahovat kreslící vrstvu</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Přiblížení</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
+        <source>Close</source>
+        <translation>Zavřít</translation>
+    </message>
 </context>
 <context>
     <name>TrackPointProperties</name>
     <message>
-        <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="51"/>
-        <source>Id</source>
-        <translation>Id</translation>
+        <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="14"/>
+        <source>Trackpoint</source>
+        <translation>Traťový bod</translation>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="34"/>
@@ -6982,6 +7021,16 @@ p, li { white-space: pre-wrap; }
         <translation>Zeměpisná délka</translation>
     </message>
     <message>
+        <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="51"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="58"/>
+        <source>xxx</source>
+        <translation>xxx</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="81"/>
         <source>Tags</source>
         <translation>Značky</translation>
@@ -6989,27 +7038,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="14"/>
-        <source>Trackpoint</source>
-        <translation>Traťový bod</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="58"/>
-        <source>xxx</source>
-        <translation>xxx</translation>
+        <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -7020,14 +7064,19 @@ p, li { white-space: pre-wrap; }
         <translation>Dialog</translation>
     </message>
     <message>
+        <location filename="../src/common/UploadMapDialog.ui" line="36"/>
+        <source>Website</source>
+        <translation>Webová stránka</translation>
+    </message>
+    <message>
         <location filename="../src/common/UploadMapDialog.ui" line="49"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../src/common/UploadMapDialog.ui" line="88"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../src/common/UploadMapDialog.ui" line="56"/>
+        <source>Username</source>
+        <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="63"/>
@@ -7035,14 +7084,9 @@ p, li { white-space: pre-wrap; }
         <translation>Použít Proxy</translation>
     </message>
     <message>
-        <location filename="../src/common/UploadMapDialog.ui" line="56"/>
-        <source>Username</source>
-        <translation>Uživatelské jméno</translation>
-    </message>
-    <message>
-        <location filename="../src/common/UploadMapDialog.ui" line="36"/>
-        <source>Website</source>
-        <translation>Webová stránka</translation>
+        <location filename="../src/common/UploadMapDialog.ui" line="88"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="104"/>
@@ -7053,49 +7097,42 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
-        <source>Clear</source>
-        <translation>Smazat</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Přiblížení</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
+        <source>Clear</source>
+        <translation>Smazat</translation>
+    </message>
 </context>
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="341"/>
-        <source>Add</source>
-        <translation>Přidat</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adresa a cesta nemůže být prázdná.</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
+        <source>WMS servers setup</source>
+        <translation>Nastavení WMS serverů</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="20"/>
+        <source>WMS Servers</source>
+        <translation>WMS Servery</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
-        <source>Apply</source>
-        <translation>Použít</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="47"/>
+        <source>Server list:</source>
+        <translation>Seznam serverů:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Stahování selhalo: %1.</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="78"/>
+        <source>Name:</source>
+        <translation>Jméno:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Chyba při dotazu na schopnosti.
-</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>Server URL:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
@@ -7103,25 +7140,18 @@ p, li { white-space: pre-wrap; }
         <translation>Vrstvy:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: GetCapabilities</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="78"/>
-        <source>Name:</source>
-        <translation>Jméno:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
@@ -7131,27 +7161,42 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
         <source>Zoom levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
         <source>Image format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Styly:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
+        <source>Apply</source>
+        <translation>Použít</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="341"/>
+        <source>Add</source>
+        <translation>Přidat</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="348"/>
@@ -7159,34 +7204,33 @@ p, li { white-space: pre-wrap; }
         <translation>Odstranit</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="47"/>
-        <source>Server list:</source>
-        <translation>Seznam serverů:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Styly:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: GetCapabilities</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="20"/>
-        <source>WMS Servers</source>
-        <translation>WMS Servery</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Adresa a cesta nemůže být prázdná.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
-        <source>WMS servers setup</source>
-        <translation>Nastavení WMS serverů</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Chyba při dotazu na schopnosti.
+</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>Server URL:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Stahování selhalo: %1.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_de.ts b/translations/merkaartor_de.ts
index 11198b1..06df937 100644
--- a/translations/merkaartor_de.ts
+++ b/translations/merkaartor_de.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -9,47 +7,19 @@
         <translation>Über Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Dieses Programm ist unter der GNU Public License v2 lizenziert</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
-        <source>TextLabel</source>
-        <translation>Beschriftung</translation>
-    </message>
-    <message>
         <location filename="../src/common/AboutDialog.ui" line="30"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor-Version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -67,7 +37,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (erstellt mit <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -80,7 +50,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4-Version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -93,106 +63,164 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL-Version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Copyright Bart Vanhauwaert, Chris Browet und andere, 2006-2012</translation>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
+        <source>TextLabel</source>
+        <translation>Beschriftung</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation>Urheberrechte bei Bart Vanhauwaert, Chris Browet, Ladislav Láska und weiteren, 2006-2015</translation>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Dieses Programm ist unter der GNU General Public License v2 lizenziert</translation>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Änderungsprotokoll</translation>
     </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
 </context>
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Tastenkürzel</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importieren</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Exportieren</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Standard</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Tastenkürzeleditor</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Tastenkürzelschema laden</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Merkaartor-Tastenkürzelschema (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Datei kann nicht geöffnet werden</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 konnte nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Tastenkürzelschema speichern</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>unbenannt</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Datei kann nicht gespeichert werden.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 konnte nicht geschrieben werden.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation>Entschuldigen Sie, mit dem kann ich keine Brücke bauen. Bitte wählen Sie nur zwei Punkte aus.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation>Segment zu Brücke konvertieren</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation>Das gewählte Segment ist bereits als Brücke oder Tunnel markiert. Bitte vergewissern Sie sich, was Sie tun.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation>Aktion nicht unterstützt: Die Brücke schein kein einzelner Weg zu sein.</translation>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -246,10 +274,7 @@ p, li { white-space: pre-wrap; }
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform>Es gibt  <b>%n</b> ungespeichertes Objekt</numerusform>
-            <numerusform>Es gibt <b>%n</b> ungespeicherte Objekte</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -279,7 +304,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -296,7 +321,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
@@ -304,21 +329,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyListExecutor</name>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="423"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="430"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="446"/>
-        <source>Error uploading request</source>
-        <translation>Fehler beim Hochladen der Anforderung</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="427"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="447"/>
-        <source>There was an error uploading this request (%1)
-Server message is '%2'</source>
-        <translation>Fehler beim Hochladen der Anfrage (%1)!
-Die Servernachricht ist '%2'</translation>
-    </message>
-    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="326"/>
         <location filename="../src/Sync/DirtyList.cpp" line="570"/>
         <source>ADD road %1</source>
@@ -373,19 +383,24 @@ Die Servernachricht ist '%2'</translation>
         <translation>ENTFERNEN Relation %1</translation>
     </message>
     <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="423"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="430"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="446"/>
+        <source>Error uploading request</source>
+        <translation>Fehler beim Hochladen der Anforderung</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="424"/>
         <source>Please check your username and password in the Preferences menu</source>
         <translation>Bitte Benutzername und Kennwort in den Einstellungen überprüfen</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
-        <source>OPEN changeset</source>
-        <translation>ÖFFNE Änderungssitzung</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
-        <source>CLOSE changeset</source>
-        <translation>SCHLIESSE Änderungssitzung</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="427"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="447"/>
+        <source>There was an error uploading this request (%1)
+Server message is '%2'</source>
+        <translation>Fehler beim Hochladen der Anfrage (%1)!
+Die Servernachricht ist '%2'</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
@@ -399,6 +414,16 @@ API-Meldung ist '%1'</translation>
         <source>Uploading changes...</source>
         <translation>Änderungen hochladen...</translation>
     </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
+        <source>OPEN changeset</source>
+        <translation>ÖFFNE Änderungssitzung</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
+        <source>CLOSE changeset</source>
+        <translation>SCHLIESSE Änderungssitzung</translation>
+    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -501,95 +526,95 @@ Bitte laden Sie die problematischen Daten nocheinmal, um den Konflikt zu lösen.
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>unbenannt</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Arbeitsebene</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Hochgeladene Ebene</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Hintergrundbilder</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation>Zeichnungsebene #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation>Filterebene #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>OSM Export</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Exportiere OSM...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Dokument</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
         <translation>Historie-Neu: Punkt %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
         <translation>Historie-Neu: Punkt %1 ändern</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
         <translation>Historie-Neu: Punkt %1 löschen</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
         <translation>Historie-Neu: Linie %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
         <translation>Historie-Neu: Linie %1 ändern</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
         <translation>Historie-Neu: Linie %1 löschen</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
         <translation>Historie-Neu: Relation %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
         <translation>Historie-Neu: Relation %1 ändern</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
         <translation>Historie-Neu: Relation %1 löschen</translation>
     </message>
@@ -645,111 +670,73 @@ Bitte laden Sie die problematischen Daten nocheinmal, um den Konflikt zu lösen.
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>Nicht genügend Daten heruntergeladen</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Unaufgelöste Konflikte</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Bitte lösen Sie zuerst die vorhandenen Konflikte auf</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation>MapDust</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Lade Punkte herunter</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 heruntergeladen</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Herunterladen von OSM (verbinden)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Nicht aufgelöste herunterladen...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Herunterladen fehlgeschlagen</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Lade fehlende Elemente %1 von %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Benutzername/Passwort ungültig</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Überprüfe nicht aufgelöste Elemente %1 von %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Lade Punkt %1 von %2 herunter</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Analysieren...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
         <translation>Werte XML aus</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
         <translation>Konflikte von %1</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Herunterladen von %1,%2 (Zoom %3)...</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Spur herunterladen - Punkte %1-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 heruntergeladen</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Leere Linien/Relationen erkannt</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Lade fehlende Elemente %1 von %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Leere Linien/Relationen ergeben keinen Sinn.
+Möchten Sie diese zur Löschung markieren?</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Überprüfe nicht aufgelöste Elemente %1 von %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Leeres Objekt %1 entfernen</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
         <translation>Es wurden Konflikte erkannt</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
@@ -758,132 +745,159 @@ Diese Objekte wurden als "conflict_..." in der "Konflikte ...&quo
 Um diese hochladen zu können, müssen Sie ihre Änderungen mit denen der anderen Person vereinen und dann die Objekte aus der "Konflikte ..." Ebene entfernen.</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Leere Linien/Relationen erkannt</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Leere Linien/Relationen ergeben keinen Sinn.
-Möchten Sie diese zur Löschung markieren?</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Daten werden hochgeladen …</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Leeres Objekt %1 entfernen</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Bereite Änderungen vor</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation>Unerwarteter HTTP-Status (%1)
-Servernachricht ist '%2'</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Warte auf Antwort des Servers</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation>
-API-Meldung ist '%1'</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>Fehler</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation>
-            <numerusform>Von OSM herunterladen (%n Byte)</numerusform>
-            <numerusform>Von OSM herunterladen (%n Byte)</numerusform>
-        </translation>
+        <translation><numerusform>Von OSM herunterladen (%n Byte)</numerusform><numerusform>Von OSM herunterladen (%n Byte)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation>
-            <numerusform>Von OSM herunterladen (%n kByte)</numerusform>
-            <numerusform>Von OSM herunterladen (%n kByte)</numerusform>
-        </translation>
+        <translation><numerusform>Von OSM herunterladen (%n kByte)</numerusform><numerusform>Von OSM herunterladen (%n kByte)</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
         <source>Downloading...</source>
         <translation>Herunterladen...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Analysieren...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Herunterladen von OSM (verbinden)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Nicht aufgelöste herunterladen...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation>Unerwarteter HTTP-Status (%1)
+Servernachricht ist '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Daten werden hochgeladen …</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation>
+API-Meldung ist '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Bereite Änderungen vor</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Herunterladen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Warte auf Antwort des Servers</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Benutzername/Passwort ungültig</translation>
     </message>
-</context>
-<context>
-    <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Schließen</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Unaufgelöste Konflikte</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
-        <source>Zoom</source>
-        <translation>Zoom</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Bitte lösen Sie zuerst die vorhandenen Konflikte auf</translation>
     </message>
-</context>
-<context>
-    <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
-        <source>Cannot delete</source>
-        <translation>Löschen nicht möglich</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Lade Punkt %1 von %2 herunter</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
-        <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation>Kann die Auswahl nicht löschen, da sie sich außerhalb des heruntergeladenen Bereiches befindet.</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Spur herunterladen - Punkte %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
-        <source>Cannot delete everything</source>
-        <translation>Kann nicht alles löschen</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation>MapDust</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Lade Punkte herunter</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Herunterladen von %1,%2 (Zoom %3)...</translation>
+    </message>
+</context>
+<context>
+    <name>DrawingLayerWidget</name>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
+        <source>Zoom</source>
+        <translation>Zoom</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+</context>
+<context>
+    <name>EditInteraction</name>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
+        <source>Cannot delete</source>
+        <translation>Löschen nicht möglich</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
+        <source>Cannot delete the selection because it is outside the downloaded area.</source>
+        <translation>Kann die Auswahl nicht löschen, da sie sich außerhalb des heruntergeladenen Bereiches befindet.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
+        <source>Cannot delete everything</source>
+        <translation>Kann nicht alles löschen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
         <translation>Die Auswahl kann nicht vollständig gelöscht werden, da sie teilweise außerhalb des heruntergeladenen Bereichs liegt.
 Soviel löschen wie möglich?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
         <translation>Linie %1 umkehren</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
         <translation>%1 Linien umkehren</translation>
     </message>
@@ -939,6 +953,11 @@ Soviel löschen wie möglich?</translation>
         <translation>Herunterladen fehlender Abhängigkeiten</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Zur Auswahl hinzufügen</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Entfernen</translation>
@@ -963,11 +982,6 @@ Soviel löschen wie möglich?</translation>
         <source>All</source>
         <translation>Alle</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Zur Auswahl hinzufügen</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -1018,7 +1032,7 @@ Soviel löschen wie möglich?</translation>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
@@ -1074,371 +1088,371 @@ Soviel löschen wie möglich?</translation>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Zeitüberschreitung im Netzwerk</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Kann die Details zum Foto nicht vom Walking Papers Server lesen.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Bitte die Walking Papers URL angeben</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Zentriere Karte</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation>c</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
+        <source>Remove Images</source>
+        <translation>Bilder entfernen</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
+        <source>Copy filename to clipboard</source>
+        <translation>Dateinamen in Zwischenablage kopieren</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Nächstes Bild wählen</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>BildRunter</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Vorheriges Bild wählen</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>BildHoch</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Georeferenziertes Bild speichern...</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Foto-Ebene</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Lade georeferenzierte Bilder</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>Wählen Sie die Ebene aus, zu der die Bilder gehören:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
-        <source>Wrong image?</source>
-        <translation>Falsches Bild?</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation>Ebene ist schreibgeschützt</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation>Die verwendete Ebene ist schreibgeschützt. Soll der Schutz entfernt werden?
+Anderenfalls können sie die dazugehörigen Bilder nicht laden.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Lade Bilder ...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Laden abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>Datei nicht gefunden</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>Bild "%1" wurde nicht gefunden.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>Fehler beim öffnen von "%2":
+%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Fehler beim Laden der EXIF-Daten aus "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation>Geben Sie den Versatz an</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation>Wohin sollen die Bilder versetzt werden?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>mehr zum Ende der Spur</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>mehr zum Anfang der Spur</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Keine Wegpunkte</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Keine Wegpunkte für das Bild "%1" gefunden.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'Sekunden'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'Minuten und' ss 'Sekunden'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'Stunden,' mm 'Minuten und' ss 'Sekunden'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
+        <source>Wrong image?</source>
+        <translation>Falsches Bild?</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Das Bild "%1" wurde %2 vor dem nächsten Wegpunkt aufgenommen.
 Soll es trotzdem verwendet werden?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Das Bild "%1" wurde %2 nach dem letzten aufgezeichneten Wegpunkt aufgenommen.
 Soll es trotzdem verwendet werden?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
-        <source>Remove Images</source>
-        <translation>Bilder entfernen</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation>Geben sie den Ausgabe-Dateinamen an</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Zeitüberschreitung im Netzwerk</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation>JPEG Bilder (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Kann die Details zum Foto nicht vom Walking Papers Server lesen.</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <source>Error while opening "%1":
+%2</source>
+        <translation>Fehler beim Öffnen von "%1":
+%2</translation>
     </message>
+</context>
+<context>
+    <name>GotoDialog</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Bitte die Walking Papers URL angeben</translation>
+        <location filename="../src/common/GotoDialog.ui" line="14"/>
+        <source>Go To</source>
+        <translation>Gehe zu</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <location filename="../src/common/GotoDialog.ui" line="28"/>
+        <source>Bookmark</source>
+        <translation>Lesezeichen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Zentriere Karte</translation>
+        <location filename="../src/common/GotoDialog.ui" line="61"/>
+        <source>WWW link (OSM/Google maps)</source>
+        <translation>WWW Link (OSM/Google maps)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation>c</translation>
+        <location filename="../src/common/GotoDialog.ui" line="80"/>
+        <source>Coordinates</source>
+        <translation>Koordinaten</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
-        <source>Copy filename to clipboard</source>
-        <translation>Dateinamen in Zwischenablage kopieren</translation>
+        <location filename="../src/common/GotoDialog.ui" line="92"/>
+        <source>Show projected</source>
+        <translation>Projiziert anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Georeferenziertes Bild speichern...</translation>
+        <location filename="../src/common/GotoDialog.ui" line="107"/>
+        <source>lonMin, latMin, lonMax, latMax</source>
+        <translation>minLän, minBr, maxLän, maxBr</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Foto-Ebene</translation>
+        <location filename="../src/common/GotoDialog.ui" line="134"/>
+        <source>latCent, lonCent, latSpan, lonSpan</source>
+        <translation>zentr. Breite, Länge, Weite Br., Län.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation>Ebene ist schreibgeschützt</translation>
+        <location filename="../src/common/GotoDialog.ui" line="156"/>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation>Die verwendete Ebene ist schreibgeschützt. Soll der Schutz entfernt werden?
-Anderenfalls können sie die dazugehörigen Bilder nicht laden.</translation>
+        <location filename="../src/common/GotoDialog.ui" line="176"/>
+        <source>OSM API Url</source>
+        <translation>OSM API-URL</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>Datei nicht gefunden</translation>
+        <location filename="../src/common/GotoDialog.ui" line="203"/>
+        <source>OSM XAPI url</source>
+        <translation>OSM XAPI-URL</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>Bild "%1" wurde nicht gefunden.</translation>
+        <location filename="../src/common/GotoDialog.ui" line="225"/>
+        <location filename="../src/common/GotoDialog.ui" line="244"/>
+        <source>Search</source>
+        <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Ungültige OSM-URL</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>Fehler beim öffnen von "%2":
-%1</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>The angegebene URL ist ungültig!</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Keine Wegpunkte</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Ungültiges Koordinatenformat</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Keine Wegpunkte für das Bild "%1" gefunden.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation>JPEG Bilder (*.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Fehler beim Laden der EXIF-Daten aus "%1".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation>Geben sie den Ausgabe-Dateinamen an</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <source>Error while opening "%1":
-%2</source>
-        <translation>Fehler beim Öffnen von "%1":
-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Nächstes Bild wählen</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>BildRunter</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Vorheriges Bild wählen</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>BildHoch</translation>
-    </message>
-</context>
-<context>
-    <name>GotoDialog</name>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Ungültige OSM-URL</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>The angegebene URL ist ungültig!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Ungültiges Koordinatenformat</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Koordinatenformat: '<linke Länge>, <untere Breite>, <rechte Länge>, <obere Breite>'</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Koordinatenformat: '<linke Länge>, <untere Breite>, <rechte Länge>, <obere Breite>'</translation>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.cpp" line="118"/>
         <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
         <translation>Koordinatenformat: '<Zentrumsbreite>, <Zentrumslänge>,<Breitenbereich>,<Längenbereich>'</translation>
     </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="14"/>
-        <source>Go To</source>
-        <translation>Gehe zu</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="28"/>
-        <source>Bookmark</source>
-        <translation>Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="61"/>
-        <source>WWW link (OSM/Google maps)</source>
-        <translation>WWW Link (OSM/Google maps)</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="80"/>
-        <source>Coordinates</source>
-        <translation>Koordinaten</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="92"/>
-        <source>Show projected</source>
-        <translation>Projiziert anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="107"/>
-        <source>lonMin, latMin, lonMax, latMax</source>
-        <translation>minLän, minBr, maxLän, maxBr</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="134"/>
-        <source>latCent, lonCent, latSpan, lonSpan</source>
-        <translation>zentr. Breite, Länge, Weite Br., Län.</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="156"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="176"/>
-        <source>OSM API Url</source>
-        <translation>OSM API-URL</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="203"/>
-        <source>OSM XAPI url</source>
-        <translation>OSM XAPI-URL</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="225"/>
-        <location filename="../src/common/GotoDialog.ui" line="244"/>
-        <source>Search</source>
-        <translation>Suchen</translation>
-    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Shape-Adapter</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
         <translation>Projektion auf die der Ebene umstellen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
         <translation>Ausrichtungsanpassung zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>WMS-Adapter</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>TMS-Adapter</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>Plugins</translation>
     </message>
@@ -1446,73 +1460,73 @@ Anderenfalls können sie die dazugehörigen Bilder nicht laden.</translation>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Karte - Keine</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Karte - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Karte - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Karte - WMS-Kacheln - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Karte - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Karte – %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation>Lizenzbestimmungen: %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation>Lizenzbedingungen nicht akzeptiert</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
         <translation>Sie haben das Kästchen, mit dem Sie die Lizenzbedingungen anerkennen, nicht angekreuzt.
 Daher können sie diese Quelle nicht als Kartenebene verwenden.
 Wollten sie das wirklich?</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Kachelgröße</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation>Min/Max Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Projektion</translation>
     </message>
@@ -1520,105 +1534,6 @@ Wollten sie das wirklich?</translation>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Zeichenkette</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Ganzzahl</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Fließkommazahl</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Längengrad</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Breitengrad</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Ungültige Projektion</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Projektion kann nicht eingestellt werden.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Keine Koordinaten</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Breiten- oder Längenfeld fehlt. Diese Datei kann nicht importiert werden.
-Wollen sie wirklich beenden?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Lade CSV Importeinstellungen</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Merkaartor Importeinstellungen (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Ungültige Datei</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 konnte nicht geöffnet werden.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 ist keine Datei für CSV-Importeinstellungen</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>CSV Importeinstellungen speichern</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>unbenannt</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Alle Dateien (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>Importeinstellungen könnten nicht gepeichert werden</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 konnte nicht geschrieben werden.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
@@ -1633,7 +1548,7 @@ Wollen sie wirklich beenden?</translation>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1768,67 +1683,148 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Einstellungen speichern...</translation>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
-        <translation>Projektion bestätigen</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Zeichenkette</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
-        <translation>Projektion kann nicht eingestellt werden, bitte geben Sie eine an</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Ganzzahl</translation>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-</context>
-<context>
-    <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n Objekt</numerusform>
-            <numerusform>%n Objekte</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Fließkommazahl</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
-        <translation>Größe</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Längengrad</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
-        <translation>Objekte</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Breitengrad</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Ungültige Projektion</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Projektion kann nicht eingestellt werden.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Keine Koordinaten</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Breiten- oder Längenfeld fehlt. Diese Datei kann nicht importiert werden.
+Wollen sie wirklich beenden?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Lade CSV Importeinstellungen</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Merkaartor Importeinstellungen (*.mis)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Ungültige Datei</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 konnte nicht geöffnet werden.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 ist keine Datei für CSV-Importeinstellungen</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>CSV Importeinstellungen speichern</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>unbenannt</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Alle Dateien (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>Importeinstellungen könnten nicht gepeichert werden</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 konnte nicht geschrieben werden.</translation>
     </message>
 </context>
 <context>
-    <name>LayerDock</name>
+    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Ebenen</translation>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation>Projektion bestätigen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Alle</translation>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation>Projektion kann nicht eingestellt werden, bitte geben Sie eine an</translation>
     </message>
+</context>
+<context>
+    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>GPS-Spuren</translation>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation>Größe</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
+        <translation>Objekte</translation>
+    </message>
+</context>
+<context>
+    <name>LayerDock</name>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
@@ -1857,6 +1853,16 @@ p, li { white-space: pre-wrap; }
         <translation>Schließen</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Ebenen</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Alle</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
         <translation>Karte</translation>
@@ -1867,6 +1873,11 @@ p, li { white-space: pre-wrap; }
         <translation>Zeichnen</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>GPS-Spuren</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
         <translation>Ebenen auf Standard zurücksetzen</translation>
@@ -1875,61 +1886,61 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
-        <source>Layer CLose: Dirty objects present</source>
-        <translation>Layer schließen: Es sind ungespeicherte Objekte vorhanden</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
-        <source>There are dirty features on this layer.
-Are you sure you want to close it? (no Undo possible)</source>
-        <translation>Diese Ebene enthält ungespeicherte Objekte.
-Wollen Sie sie wirklich schließen? (Kann nicht rückgängig gemacht werden!)</translation>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
-        <source>Layer CLose: Not empty</source>
-        <translation>Ebene schließen: Nicht leer</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
+        <source>Visible</source>
+        <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
-        <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation>Sind sie sicher, daß sie diese Ebene schließen möchten? (Wiederherstellen nicht möglich)</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
+        <source>Readonly</source>
+        <translation>Schreibgeschützt</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Hoch</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Niedrig</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Undurchsichtig</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Durchsichtigkeit</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
-        <source>Visible</source>
-        <translation>Sichtbar</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <source>Layer CLose: Dirty objects present</source>
+        <translation>Layer schließen: Es sind ungespeicherte Objekte vorhanden</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
-        <source>Readonly</source>
-        <translation>Schreibgeschützt</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
+        <source>There are dirty features on this layer.
+Are you sure you want to close it? (no Undo possible)</source>
+        <translation>Diese Ebene enthält ungespeicherte Objekte.
+Wollen Sie sie wirklich schließen? (Kann nicht rückgängig gemacht werden!)</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <source>Layer CLose: Not empty</source>
+        <translation>Ebene schließen: Nicht leer</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
+        <source>Are you sure you want to close this layer? (no Undo possible)</source>
+        <translation>Sind sie sicher, daß sie diese Ebene schließen möchten? (Wiederherstellen nicht möglich)</translation>
     </message>
 </context>
 <context>
@@ -1961,2252 +1972,2076 @@ Wollen Sie sie wirklich schließen? (Kann nicht rückgängig gemacht werden!)</t
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Lade Plugins...</translation>
+        <translation>%1 v%2
+Lade plugins...</translation>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Initialisiere...</translation>
+        <translation>%1 v%2
+Initialisieren...</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Ungespeicherte Änderungen</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>Die aktuelle Karte enthält ungespeicherte Änderungen, die verlorengehen, wenn Sie eine neue beginnen.
-Möchten Sie das Beginnen einer neuen Karte abbrechen, oder fortfahren und die alten Änderungen verwerfen?</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation>Ungespeicherte Stil-Änderungen</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation>Sie haben den aktiven Stil geändert.
-Wollen Sie Ihre Änderungen speichern?</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Linie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Keine gültige Datei</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 konnte nicht geöffnet werden.</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Ansicht</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation>Eingehender Fernsteuerungsbefehl</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Lesezeichen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation>Unbekannte Aktions-URL: %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>&Projektion setzen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Datei öffnen</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Flächen&deckung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>OSM hochladen</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Datei</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Sie haben Ihren Benutzernamen und Kennwort
-für OpenStreetMap noch nicht angegeben.
-Möchten Sie dies nun tun?</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Exportieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Herunterladen fehlgeschlagen</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Zulet&zt geöffnet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Die Karte konnte nicht heruntergeladen werden</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Zuletz&t importiert</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Fehler beim Herunterladen von OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>Werk&zeuge</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>OpenStreetBugs konnten nicht heruntergeladen werden</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Stil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation>Fehler beim Herunterladen von MapDust</translation>
-    </message>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation>Ta&gging Vorlagen</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation>Die MapDust bugs konnten nicht heruntergeladen werden</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Punkt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Linien vereinfachen</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Fenster</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Zeitüberschreitung im Netzwerk</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Unterfenster</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Kann OpenStreetBugs nicht erreichen.</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>&Objekt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Kann Fehler nicht schließen</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Kann den Fehler nicht löschen. Servernachricht ist:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>Ebe&nen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Hausnummern hinzufügen</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>in ... Segmente teilen</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>&Relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation>Geben sie die Zahl der Segmente an</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>De&tails</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>Linie in %1 Segmente unterteilen</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Richtungspfeile &anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation>An Achse ausrichten</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Haupt-Symbolleiste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation>Geben Sie die Zahl der regelmäßigen Achsen an (z.B. 4 für rechteckig)</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Beenden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>dreieckig</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&Über</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>rechteckig</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Öffnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>fünfeckig</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Ein neues Dokument erstellen und eine Datei importieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>sechseckig</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>siebeneckig</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>&Alles anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>achteckig</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>An %1 Achsen ausrichten</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Zoom auf &Rechteck</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>An %1 regelmäßigen Achsen ausrichten</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Auf Auswahlrechteck zoomen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation>Kann nicht an Achsen ausrichten</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>An Achsen ausrichten scheiterte. Bitte passen sie scharfe Ecken an und versuchen sie es noch ein Mal.</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>&Herauszoomen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>An Achsen ausrichten scheiterte oder konnte keine Näherungslösung finden.</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation>Bing Auszug</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>Hin&einzoomen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation>Punkte verteilen</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Hineinzoomen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation>Zu Multi&polygon hinzufügen</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>Flächen vereinen</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Gekrümmte Verbindung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Fläche aufteilen</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Rückgängig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation>Fläche in %1 Reihenhäuser unterteilen</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Strg+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Karten-Stil speichern</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Merkaartor-Kartenstile (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Strg+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Karten-Stil laden</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Verschieben</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Unterstützte Formate</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Strg+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Merkaartor Karten-Stile (*.mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation>MapCSS stylesheet (*.css)</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Eine Datei in das aktuelle Dokument importieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Alle Dateien (*)</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Herunterladen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Lädt Kartendaten für ein neues Gebiet herunter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation>Vorlage speichern</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Strg+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation>Vorlage kann nicht gespeichert werden</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Verbindung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>OSM exportieren</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Verbindung erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>OSM-Dateien (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>osmChange exportieren</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Auswählen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>osmChange Dateien (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Lesezeichen hinzufügen</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>Hoch&laden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Geben Sie den Namen des Lesezeichens an.</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Änderungen zum Server hochladen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Ungültiger Name für ein Lesezeichen</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Strg+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Lesezeichenname darf nicht leer sein.</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>&Entfernen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Achtung: Lesezeichen mit diesem Namen existiert bereits</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Ausgewählte Objekte entfernen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Geben Sie einen neuen Namen an, oder brechen Sie ab. Ansonsten wird das Lesezeichen überschrieben.</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Lesezeichen entfernen</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Neue Linie erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Wählen Sie das Lesezeichen, das Sie entfernen möchten.</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Strg+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation>Achtung! Die Merkaartor-Übersetzung für "%1" konnte nicht geladen werden. Es wird Englisch verwendet.</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Neuen Punkt erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Strg+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Hilfe</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>Umkeh&ren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Linienrichtung umkehren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Linie</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Gehe zu...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Bearbeiten</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Strg+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Ansicht</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Getrennte Richtungsfahrbahnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Lesezeichen</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Getrennte Richtungsfahrbahnen erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>&Projektion setzen</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation>Kreis&verkehr</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Datei</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Kreisverkehr erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Stil</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Neu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Ein neues Dokument erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>De&tails</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Auftrennen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Beenden</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Linie in einzelne (verbundene) Linien teilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&Über</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Öffnen</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Verbinden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Ein neues Dokument erstellen und eine Datei importieren</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Verbundene Linien zu einer vereinen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>&Alles anzeigen</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>Auf&teilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Zoom auf &Rechteck</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Trennen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Auf Auswahlrechteck zoomen</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Verbundene Linien auftrennen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>&Herauszoomen</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>&Relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>Hin&einzoomen</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Relation erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Hineinzoomen</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Fläche</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Gekrümmte Verbindung</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Neue Fläche erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Rückgängig</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Strg+Z</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Speichern &unter...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Wiederherstellen</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Laden...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Strg+Y</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Kurvige Straße</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importieren</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Einstellungen…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Eine Datei in das aktuelle Dokument importieren</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Alles…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Strg+D</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Alle sichtbaren Ebenen in eine Datei exportieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Verbindung</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Suchen...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Verbindung erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Suchen und Auswählen von Elementen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Bildausschnitt…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Strg+U</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Die Objekte im Bildausschnitt in eine Datei speichern</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>&Entfernen</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Hinzufügen…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Entfernen…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation>Kreis&verkehr</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Vereinigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>&Verteilen</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Punkte vereinigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation>Punkte verteilen</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Die gewählten Punkte vereinigen (der zuerst gewählte bleibt erhalten)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Ausgewählte Punkte ausrichten und gleichmäßig verteilen</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Speichern</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>K&noten anzeigen</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>In einer Datei speichern</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>&Namen anzeigen</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Strg+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>WMS Server bearbeiten...</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Mehr herunterladen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>&TMS Server bearbeiten...</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Lädt mehr Kartendaten für das aktuell sichtbare Gebiet herunter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation>&Polygon</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Herunterladen der aktuellen Ansicht in die vorige Downloadebene</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation>Rechteckiges &Gebäude</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Strg+Umschalt+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation>Neue &Bilderebene</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Hausnummern hinzufügen (Karlsruhe Schema)</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Eigenschafts-Fenster zeigen/verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Unterteilen</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Strg+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation>Segment gleichmäßig unterteilen</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Ebenen-Fenster zeigen/verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation>Unterteilt ein gewähltes Liniensegment (Linie und 2 benachbarte Punkte) in gleich lange Segmente.</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Strg+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>Koordinatennet&z zeigen</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Info</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>Zoomstufen an &Kacheln anpassen</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Info-Fenster zeigen/verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>&Projektionseditor...</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Strg+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>&Fotos in der Karte zeigen</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Ausrichten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Punkte ausrichten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Löschung erzwingen</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Ausgewählte Punkte ausrichten. Die ersten zwei legen die Linie fest.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation>Neue &OpenStreetBugs Ebene</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation>Neue &Zeichnungsebene</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>&Verteilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation>Neue &Filterebene</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation>Punkte verteilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation>Multipolygon erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Ausgewählte Punkte ausrichten und gleichmäßig verteilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation>Zu Multipolygon hinzufügen</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Rückgängig-Fenster zeigen/verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation>GDAL</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Strg+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation>Bing Straßen-Erkennung</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>&Heruntergeladene Gebiete anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation>&Historie neu erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Strg+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation>Neue &MapDust Ebene</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Kopieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation>Drahtgitter</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Ausgewählte Objekte und Merkmale in die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation>Strg+Alt+W</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Die Merkmale der aktuellen Auswahl in die Zwischenablage kopieren. Zusätzliches Kopieren der Koordinaten, wenn die Auswahl ein Punkt ist.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation>Elternelement(e) selektieren</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Strg+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Herunterladen fehlender Abhängigkeiten</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Merkmale einfügen (Ü&berschreiben)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Schließen</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Merkmale aus der Zwischenablage in aktuelle Auswahl einfügen (und überschreiben).</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>Vere&infachen</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Strg+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Linie(e) vereinfachen</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>&Merkmale einfügen (Vereinen)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Linie vereinfachen, indem unnötige Kind-Punkte entfernt werden</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Merkmale einfügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>&Filter Editor...</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Merkmale aus der Zwischenablage einfügen (mit existierenden Merkmalen vereinen)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>&Keiner</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Merkmale aus der Zwischenablage mit denen der aktuellen Auswahl vereinigen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation>&Flächen verbinden</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Strg+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation>Sich berührende Flächen vereinen</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Gewählt...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation>Sich berührende Flächen vereinen.</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>&Objekt(e) einfügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>Fläche &teilen</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation>Fläche entlang zweier Punkte teilen</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Objekte aus der Zwischenablage einfügen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation>Die gewählte Fläche an zwei gewählten Punkte in einzelne Flächen teilen.</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Objekte aus der Zwischenablage einfügen. Wenn diese schon vorhanden sind, werden sie überschrieben.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>&Gebäudeteilung</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Strg+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation>Fläche in Reihenhäuser unterteilen</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation>Fläche in Reihenhäuser unterteilen.</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binär)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation>Symbolleisten-Editor ...</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>Hochladen erz&wingen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation>A&chsenausrichtung</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Objekt in die Arbeitsebene übertragen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation>Kanten an regelmäßigen Achsen ausrichten</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Die Auswahl aus einer nicht-hochladbaren Ebene (z.B. GPS-Spur oder Extrakt) in die Arbeitsebene kopieren, bereit zum Hochladen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation>Kanten an einer bestimmten Anzahl von regelmäßigen Achsen ausrichten.</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>&Drucken ...</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation>Druckvorschau...</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Symbolleiste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation>Ungespeicherte Objekte hervorheben</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Symbolleiste zeigen/verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation>A&usschneiden</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Alle verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Strg+X</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Strg+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation>E&xtrudieren</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Alle anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation>Extrudier-Aktionen (wie bei JOSM)</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>&Bilderebene</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation>Alt+X</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation>Auswahl umkehren</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>K&noten anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation>Kind-Elemente in Auswahl aufnehmen</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Strg+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>&Skalieren</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>&Namen anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation>Als Vorlage speichern ...</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Strg+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Punkt</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Start</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>Umkeh&ren</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>GPS starten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Getrennte Richtungsfahrbahnen</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Erneut abspielen...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Neu</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>GPS erneut abspielen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Ein neues Dokument erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Auftrennen</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>GPS-Fenster zeigen/verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Verbinden</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Strg+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>Auf&teilen</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>S&top</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>&Relation</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>GPS beenden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Fläche</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>Auf GPS-Position &zentrieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Speichern</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>GPS-Spur-Segmente anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Kurvige Straße</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Strg+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Einstellungen…</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>&Maßstab anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Alles…</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Strg+Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Alle sichtbaren Ebenen in eine Datei exportieren</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>&Relationen anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Bildausschnitt…</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Strg+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Die Objekte im Bildausschnitt in eine Datei speichern</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Linienhintergrund anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Hinzufügen…</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Linienrand anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Entfernen…</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Details (Hervorhebungen) anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>Unaufgelöste Konflikte</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Aufzeichnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Bitte lösen Sie zuerst die vorhandenen Konflikte auf</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>GPS aufzeichnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Vereinigen</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Die gewählten Punkte vereinigen (der zuerst gewählte bleibt erhalten)</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>GPS anhalten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Merkaartor-Dokument speichern</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoreferenziertes Bild</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Merkaartor-Dokumente (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Bilder-Fenster zeigen/verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Strg+O</translation>
-    </message>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Strg+E</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Strg+N</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Welt-OSB-Manager...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Speichern &unter...</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>Ta&stenkürzeleditor...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Strg+S</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Vereinigen...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Mehr herunterladen</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Speichern...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Herunterladen der aktuellen Ansicht in die vorige Downloadebene</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>Mitglied &hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Strg+Umschalt+D</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>Mitglied &entfernen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Alte Qt-Version entdeckt</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Niemals</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Ihr System nutzt Qt %1, welches verschiedene Fehler beim Hochladen von Daten zu OpenStreetMap verursacht. Diese können zu "401"-Fehlermeldungen führen. Möchten Sie fortfahren (nicht empfohlen)?
-Für weitere Informationen lesen Sie http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor (englisch)</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>Für &Einbahnstraßen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>unbenannt</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Immer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Fenster</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Loslösen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Unterfenster</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Punkt von einer Linie lösen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Eigenschafts-Fenster zeigen/verstecken</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Einen Punkt von einer Linie lösen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Strg+P</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Offline arbeiten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Ebenen-Fenster zeigen/verstecken</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Strg+L</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Stile</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Info-Fenster zeigen/verstecken</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Stile-Fenster zeigen/verstecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Strg+I</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Strg+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>WMS Server bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>&TMS Server bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Strg+R</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>Abschaltbare &Dialoge zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Strg+M</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>GPS-Menu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Suchen...</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Kamera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Suchen und Auswählen von Elementen</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>&Kreuzung erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Ausrichten</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>&Drehen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Ausgewählte Punkte ausrichten. Die ersten zwei legen die Linie fest.</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Strg+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation>&Polygon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation>Rechteckiges &Gebäude</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation>Neue &Bilderebene</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Objekte</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Hausnummern hinzufügen (Karlsruhe Schema)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>%1 Merkmal von %2 löschen</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Unterteilen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Fläche %1 erzeugen</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation>Segment gleichmäßig unterteilen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Fläche: Linie %1 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation>Unterteilt ein gewähltes Liniensegment (Linie und 2 benachbarte Punkte) in gleich lange Segmente.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Fläche: Linie %1 abschließen</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>&Virtuelle Punkte anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Fläche: Punkt %1 zu Linie %2 hinzufügen</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Koordinatennet&z zeigen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>Fläche schließen %1</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>Zoomstufen an &Kacheln anpassen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>&Projektionseditor...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Punkt zu richtungsgetrennter Straße %1 hinzufügen</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>&Fotos in der Karte zeigen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Richtungsgetrennte Straße %1 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Punkt auf Linie %1 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Löschung erzwingen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Punkt (POI) %1 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation>Neue &OpenStreetBugs Ebene</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Kreisverkehr %1 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Punkt %1 auf Linie %2 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>Vere&infachen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Linie %1 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Linie(e) vereinfachen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Linie %1 schließen</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>Linie vereinfachen, indem unnötige Kind-Punkte entfernt werden</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>LINKSKLICK: Auswählen;STRG+LINKSKLICK: Zur Auswahl hinzufügen;LINKS ZIEHEN: Auswahlrechteck;RECHTS ZIEHEN: Ebene verschieben;STRG+RECHTS ZIEHEN: Zoom;DOPPELKLICK: Neuer Punkt;DOPPELKLICK auf Punkt: Neue Linie</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>&Filter Editor...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>KLICK: auswählen/verschieben; \r
-STRG+KLICK: Auswahl umkehren; \r
-SHIFT+KLICK: zur Auswahl hinzufügen; \r
-SHIFT+ZIEHEN: Flächenauswahl; \r
-STRG+ZIEHEN: Zoom; \r
-DOPPELKLICK: Neuer Punkt; \r
-DOPPELKLICK auf Punkt: neue Linie</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>&Keiner</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Objekt %1 entfernen</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation>&Flächen verbinden</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation>Objekte entfernen</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation>Sich berührende Flächen vereinen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>Wollen sie die enthaltenen Punkte auch löschen?
-OSM-Punkte außerhalb des heruntergeladenen Bereiches bleiben erhalten.</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation>Sich berührende Flächen vereinen.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation>%1 Linien umkehren</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>Fläche &teilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Linien vereinen</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation>Fläche entlang zweier Punkte teilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Linien teilen</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation>Die gewählte Fläche an zwei gewählten Punkte in einzelne Flächen teilen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Linien auftrennen</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>&Gebäudeteilung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Ungültige Datei</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation>Fläche in Reihenhäuser unterteilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Punkte ausrichten</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Punkte vereinigen in %1</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation>Fläche in Reihenhäuser unterteilen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Rückgängig-Fenster zeigen/verstecken</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation>Symbolleisten-Editor ...</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Relation %1 geändert</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation>A&chsenausrichtung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Ist es sehr empfehlenswert nach dem Hochladen die Änderungen in Ihrem Dokument zu speichern.
-Wollen Sie dies jetzt erledigen?</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation>Kanten an regelmäßigen Achsen ausrichten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Zwischenablage ungültig</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation>Kanten an einer bestimmten Anzahl von regelmäßigen Achsen ausrichten.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Relation %1 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>&Drucken ...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Strg+Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation>Druckvorschau...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Die Merkmale der aktuellen Auswahl in die Zwischenablage kopieren. Zusätzliches Kopieren der Koordinaten, wenn die Auswahl ein Punkt ist.</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Eigenschaften...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Strg+C</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation>Ungespeicherte Objekte hervorheben</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Merkmale aus der Zwischenablage in aktuelle Auswahl einfügen (und überschreiben).</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation>Neue &Zeichnungsebene</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Strg+V, O</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation>A&usschneiden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Merkmale aus der Zwischenablage mit denen der aktuellen Auswahl vereinigen.</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Strg+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Strg+V, M</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation>Neue &Filterebene</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Gewählt...</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation>E&xtrudieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Objekte aus der Zwischenablage einfügen. Wenn diese schon vorhanden sind, werden sie überschrieben.</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation>Extrudier-Aktionen (wie bei JOSM)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Strg+V, F</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation>Auswahl umkehren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binär)</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation>Kind-Elemente in Auswahl aufnehmen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 ist kein gültiges Merkaartor-Dokument.</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>&Skalieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Die Auswahl aus einer nicht-hochladbaren Ebene (z.B. GPS-Spur oder Extrakt) in die Arbeitsebene kopieren, bereit zum Hochladen</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation>Als Vorlage speichern ...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>GPX exportieren</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation>Multipolygon erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPX-Dateien (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation>Zu Multipolygon hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>KML exportieren</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KML-Dateien (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation>Bing Straßen-Erkennung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Strg+T</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation>&Historie neu erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation>Neue &MapDust Ebene</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation>Drahtgitter</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Setze Merkmale für %1</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation>Strg+Alt+W</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Punkt %1 erstellen</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation>Elternelement(e) selektieren</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Punkt %1 zu Linie %2 hinzufügen</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Herunterladen fehlender Abhängigkeiten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>Kachel %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Eigenschaften...</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation><html><head/><body><p>Weg in Brücke wandeln</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Die Zwischenablage enthält keine gültigen Daten</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>%1 Merkmal von %2 löschen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Punkte</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>%1 Merkmale von %2 löschen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>GPS-Spur %1</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation>"source" Merkmal für %1 setzen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>GPS-Fehler</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Entferne Mitglied '%1' aus %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Der GPS-Port kann nicht geöffnet werden.</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Mitglieder in Relation %1 ordnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Öffne NMEA-Logdatei</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Relation %1 geändert</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>Ebe&nen</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Punkt-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>&Heruntergeladene Gebiete anzeigen</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Punkt auf Linie %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Symbolleiste</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Flächen-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Symbolleiste zeigen/verstecken</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Fläche %1 erzeugen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Alle verstecken</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Fläche: Linie %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Strg+F</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Loch hinzufügen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Alle anzeigen</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Möchten Sie ein (weiteres) Loch in die äußere Fläche einfügen?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>&Bilderebene</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Fläche: Linie %1 abschließen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Strg+Alt+P</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Fläche: Punkt %1 zu Linie %2 hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Strg+Alt+N</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Fläche schließen %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Start</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Erneut abspielen...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Punkt zu richtungsgetrennter Straße %1 hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>GPS-Fenster zeigen/verstecken</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Richtungsgetrennte Straße %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Strg+G</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Punkt (POI) %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation>Ta&gging Vorlagen</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>LINKSKLICK: Starten;ZIEHEN: Skalieren;SHIFT+ZIEHEN: Drehen;LINKSKLICK: Beenden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>S&top</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Polygon-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>Auf GPS-Position &zentrieren</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Polygon %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>GPS-Spur-Segmente anzeigen</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Kreisverkehrs-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Strg+Alt+T</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Kreisverkehr %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>&Maßstab anzeigen</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Linien-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Strg+Alt+M</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Punkt %1 auf Linie %2 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>&Relationen anzeigen</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Linie %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Strg+Alt+R</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Punkt %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Linienhintergrund anzeigen</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Punkt %1 zu Linie %2 hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Linienrand anzeigen</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Linie %1 schließen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Details (Hervorhebungen) anzeigen</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>LINKSKLICK: Auswählen;STRG+LINKSKLICK: Zur Auswahl hinzufügen;LINKS ZIEHEN: Auswahlrechteck;RECHTS ZIEHEN: Ebene verschieben;STRG+RECHTS ZIEHEN: Zoom;DOPPELKLICK: Neuer Punkt;DOPPELKLICK auf Punkt: Neue Linie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Aufzeichnen</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>KLICK: auswählen/verschieben; \r
+STRG+KLICK: Auswahl umkehren; \r
+SHIFT+KLICK: zur Auswahl hinzufügen; \r
+SHIFT+ZIEHEN: Flächenauswahl; \r
+STRG+ZIEHEN: Zoom; \r
+DOPPELKLICK: Neuer Punkt; \r
+DOPPELKLICK auf Punkt: neue Linie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Editier-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Bilder-Fenster zeigen/verstecken</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Objekt %1 entfernen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Strg+E</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>Objekte entfernen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Urheberrechtswarnung</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Kind-Elemente löschen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Datei kann nicht gespeichert werden.</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>Wollen sie die enthaltenen Punkte auch löschen?
+OSM-Punkte außerhalb des heruntergeladenen Bereiches bleiben erhalten.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 konnte nicht geschrieben werden.</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>%1 Linien umkehren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Herunterladen</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation>Linie %1 extrudieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>Hoch&laden</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>LINKSKLICK: auswählen;LINKS ZIEHEN: verschieben</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Gehe zu...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Punkt-Verscheibe-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Getrennte Richtungsfahrbahnen erstellen</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Punkt verschieben</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Kreisverkehr erstellen</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Punkt %1 verschieben</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Relation erstellen</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Punkt an derselben Position gefunden.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Suchen</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Möchten Sie alle Punkte an der Zielstelle vereinigen?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Punkte vereinigen</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Punkte vereinigen in %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Objekt in die Arbeitsebene übertragen</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation>DARÜBERHALTEN: Auswählen;ZIEHEN: Drehen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>GPS starten</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Drehungs-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>GPS erneut abspielen</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation>Objekt drehen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Strg+W</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation>DARÜBERHALTEN: Auswählen;ZIEHEN: Skalieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>GPS beenden</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation>Skalieren-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>GPS aufzeichnen</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation>Objekt skalieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>GPS anhalten</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>LINKSKLICK in erste Ecke -> LINKS ZIEHEN um Gebiet zu wählen -> LINKSKLICK zum zoomen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Welt-OSB-Manager...</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Zoom-Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>Ta&stenkürzeleditor...</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>GPS Exchange-Format (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Richtungspfeile &anzeigen</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>OpenStreetMap-Format (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Flächen&deckung</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>OSM Änderungsformat (*.osc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Exportieren</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Noni GPSPlot-Format (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Zulet&zt geöffnet</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>NMEA GPS-Logformat (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Zuletz&t importiert</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>KML-Datei (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>Werk&zeuge</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Kommagetrenntes Format (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>&Objekt</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Georeferenzierte Bilder (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>ESRI Shapedatei (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>&Relation</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation>Geography Markup Language (*.gml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>Haupt-Symbolleiste</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation>Protobuf Binärformat
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Verschieben</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Unterstützte Formate</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Auswählen</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Merkaartor-Dokument (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Bearbeiten...</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Speichern...</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>Kachel %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Laden...</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Kann Projektionsdatei nicht laden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopieren</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Merkmale einfügen (Ü&berschreiben)</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>&Merkmale einfügen (Vereinen)</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Vereinigen...</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>Mitglied &hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>Mitglied &entfernen</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Niemals</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projections.xml" konnte nirgendwo geöffnet werden. Abbruch.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>Für &Einbahnstraßen</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Hoch</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Immer</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Niedrig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Loslösen</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Undurchsichtig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Einen Punkt von einer Linie lösen</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Objekt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Offline arbeiten</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Punkt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Linie</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Punkt an derselben Position gefunden.</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relation</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Möchten Sie alle Punkte an der Zielstelle vereinigen?</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Lade Bild</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Hoch</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Position des Punkts zu Bild hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Niedrig</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Bild mit dieser Position georeferenzieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Undurchsichtig</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
         <source>Show</source>
         <translation>Details</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
         <source>Directional Arrows</source>
         <translation>Richtungspfeile</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
         <source>Layers</source>
         <translation>Ebenen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
         <source>Create</source>
         <translation>Erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Objekt</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Punkt</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
         <source>Way</source>
         <translation>Linie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relation</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>GPS Exchange-Format (*.gpx)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>OpenStreetMap-Format (*.osm)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>OSM Änderungsformat (*.osc)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Noni GPSPlot-Format (*.ngt)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>NMEA GPS-Logformat (*.nmea *.nma)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>KML-Datei (*.kml)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Kommagetrenntes Format (*.csv)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Georeferenzierte Bilder (*.jpg)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>ESRI Shapedatei (*.shp)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation>Geography Markup Language (*.gml)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation>Protobuf Binärformat
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Merkaartor-Dokument (*.mdc)
-</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Linie</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Lade Bild</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Position des Punkts zu Bild hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Bild mit dieser Position georeferenzieren</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
         <source>Tools</source>
         <translation>Werkzeuge</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
         <source>Windows</source>
         <translation>Fenster</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
         <source>Cut Features</source>
         <translation>Objekte ausschneiden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation>Datei importieren</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Punkt %1 lösen</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Mitglied zu einer Relation hinzufügen</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Zwischenablage ungültig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Ein Mitglied aus einer Relation entfernen</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Die Zwischenablage enthält keine gültigen Daten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation>Historie neu erstellen</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation>Datei importieren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation>Objektextrahierung</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Ungespeicherte Änderungen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation>Extrahiere Objekte....</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>Die aktuelle Karte enthält ungespeicherte Änderungen, die verlorengehen, wenn Sie eine neue beginnen.
+Möchten Sie das Beginnen einer neuen Karte abbrechen, oder fortfahren und die alten Änderungen verwerfen?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation>Werkzeugbeschriftung verbergen</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation>Ungespeicherte Stil-Änderungen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Tagging-Vorlagen speichern</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation>Sie haben den aktiven Stil geändert.
+Wollen Sie Ihre Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Merkaartor-Taggingvorlagen (*.mat)</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Punkte</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Tagging-Vorlagen öffnen</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>GPS-Spur %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Entferne Mitglied '%1' aus %2</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Urheberrechtswarnung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
         <source>You are trying to import a KML file. Please be aware that:
 
  - You cannot import to OSM a KML file created from Google Earth. While you might
@@ -4235,603 +4070,800 @@ Falls Sie unsicher sind suchen Sie Hilfe auf den "legal", "talk&q
 Sind Sie sicher, dass diese KML-Daten legal in OSM importiert werden dürfen?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Lädt Kartendaten für ein neues Gebiet herunter</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Keine gültige Datei</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Änderungen zum Server hochladen</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 konnte nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Ausgewählte Objekte entfernen</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation>Eingehende "Remote Control" Anfrage</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Neue Linie erstellen</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Neuen Punkt erstellen</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation>Eingehender Fernsteuerungsbefehl</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Linienrichtung umkehren</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation>Unbekannte Aktions-URL: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Linie in einzelne (verbundene) Linien teilen</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Verbundene Linien zu einer vereinen</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Alte Qt-Version entdeckt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Trennen</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Ihr System nutzt Qt %1, welches verschiedene Fehler beim Hochladen von Daten zu OpenStreetMap verursacht. Diese können zu "401"-Fehlermeldungen führen. Möchten Sie fortfahren (nicht empfohlen)?
+Für weitere Informationen lesen Sie http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor (englisch)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Verbundene Linien auftrennen</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>OSM hochladen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Neue Fläche erstellen</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Sie haben Ihren Benutzernamen und Kennwort
+für OpenStreetMap noch nicht angegeben.
+Möchten Sie dies nun tun?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>In einer Datei speichern</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Herunterladen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Lädt mehr Kartendaten für das aktuell sichtbare Gebiet herunter</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Die Karte konnte nicht heruntergeladen werden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Punkte ausrichten</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Fehler beim Herunterladen von OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Ausgewählte Objekte und Merkmale in die Zwischenablage kopieren</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>OpenStreetBugs konnten nicht heruntergeladen werden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Merkmale einfügen</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation>Fehler beim Herunterladen von MapDust</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Merkmale aus der Zwischenablage einfügen (mit existierenden Merkmalen vereinen)</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation>Die MapDust bugs konnten nicht heruntergeladen werden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Einfügen</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Polygon erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Objekte aus der Zwischenablage einfügen.</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Anzahl der Seiten angeben</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Punkt von einer Linie lösen</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Linien vereinen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Eigenschaften</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Linien teilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Info</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Linien auftrennen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Linien vereinfachen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eoreferenziertes Bild</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Hochladen des Objekts erzwingen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Stile</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Zeitüberschreitung im Netzwerk</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Stile-Fenster zeigen/verstecken</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Kann OpenStreetBugs nicht erreichen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (intern)</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Kann Fehler nicht schließen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Loch hinzufügen.</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Kann den Fehler nicht löschen. Servernachricht ist:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Möchten Sie ein (weiteres) Loch in die äußere Fläche einfügen?</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Kreuzung erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Kann Projektionsdatei nicht laden</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Mehrfachkreuzung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>"Projections.xml" konnte nirgendwo geöffnet werden. Abbruch.</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Diese Linien schneiden sich mehrfach.
+Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollte Kreuzungen können danach noch gelöscht werden)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Kreuzung erstellen</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Hausnummern hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Ungültige Projektion</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>in ... Segmente teilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Projektion "%1" kann nicht eingestellt werden.</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation>Geben sie die Zahl der Segmente an</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Strg+B</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>Linie in %1 Segmente unterteilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>Abschaltbare &Dialoge zurücksetzen</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation>An Achse ausrichten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>GPS-Menu</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation>Geben Sie die Zahl der regelmäßigen Achsen an (z.B. 4 für rechteckig)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>dreieckig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>&Kreuzung erstellen</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>rechteckig</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Kind-Elemente löschen.</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>fünfeckig</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Merkmale für mehrere Objekte setzen</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>sechseckig</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Flächen-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>siebeneckig</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Punkt-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>achteckig</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>LINKSKLICK: Starten;ZIEHEN: Skalieren;SHIFT+ZIEHEN: Drehen;LINKSKLICK: Beenden</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>An %1 Achsen ausrichten</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Polygon-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>An %1 regelmäßigen Achsen ausrichten</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Polygon %1 erstellen</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation>Kann nicht an Achsen ausrichten</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Kreisverkehrs-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>An Achsen ausrichten scheiterte. Bitte passen sie scharfe Ecken an und versuchen sie es noch ein Mal.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Linien-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>An Achsen ausrichten scheiterte oder konnte keine Näherungslösung finden.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Editier-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation>Bing Auszug</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Punkt verschieben</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Punkte ausrichten</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Punkt %1 verschieben</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation>Punkte verteilen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>LINKSKLICK: auswählen;LINKS ZIEHEN: verschieben</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Punkt %1 lösen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Punkt-Verscheibe-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Mitglied zu einer Relation hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation>DARÜBERHALTEN: Auswählen;ZIEHEN: Drehen</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Ein Mitglied aus einer Relation entfernen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Drehungs-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation>Zu Multi&polygon hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation>Objekt drehen</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Flächen vereinen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>LINKSKLICK in erste Ecke -> LINKS ZIEHEN um Gebiet zu wählen -> LINKSKLICK zum zoomen</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Fläche aufteilen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Zoom-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation>Fläche in %1 Reihenhäuser unterteilen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Polygon erstellen</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Relation %1 erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Anzahl der Seiten angeben</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Karten-Stil speichern</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Hochladen des Objekts erzwingen</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Merkaartor-Kartenstile (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>Hochladen erz&wingen</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Karten-Stil laden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>&Drehen</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Merkaartor Karten-Stile (*.mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Strg+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation>MapCSS stylesheet (*.css)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Mehrfachkreuzung</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation>Historie neu erstellen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Diese Linien schneiden sich mehrfach.
-Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollte Kreuzungen können danach noch gelöscht werden)?</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>&Objekt(e) einfügen</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>unbenannt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Objekte</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Merkaartor-Dokument speichern</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>&Virtuelle Punkte anzeigen</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Merkaartor-Dokumente (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>%1 Merkmale von %2 löschen</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation>Vorlage speichern</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Mitglieder in Relation %1 ordnen</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Datei kann nicht gespeichert werden.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation>Linie %1 extrudieren</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 konnte nicht geschrieben werden.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation>DARÜBERHALTEN: Auswählen;ZIEHEN: Skalieren</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation>Vorlage kann nicht gespeichert werden</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation>Skalieren-Aktionen</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Ungültige Datei</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation>Objekt skalieren</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 ist kein gültiges Merkaartor-Dokument.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation>"source" Merkmal für %1 setzen</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>OSM exportieren</translation>
     </message>
-</context>
-<context>
-    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
-        <source><i>V: </i><b>%1</b> </source>
-        <translation><i>V: </i><b>%1</b> </translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>OSM-Dateien (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
-        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>Stand: </i><b>%1</b&gt; von <b>%2</b></translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>osmChange exportieren</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>Stand: </i><b>%1</b></translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>osmChange Dateien (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
-        <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation><br/><i>Ebene: </i><b>%1</b> </translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>GPX exportieren</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
-        <source>Browse</source>
-        <translation>Im Browser anzegen</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPX-Dateien (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>size</source>
-        <translation>Größe</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>KML exportieren</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>members</source>
-        <translation>Mitglieder</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KML-Dateien (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
-        <source>Topleft</source>
-        <translation>Oben Links</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation>Objektextrahierung</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
-        <source>Botright</source>
-        <translation>Unten rechts</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation>Extrahiere Objekte....</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
-        <source>Relation</source>
-        <translation>Relation</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation>Werkzeugbeschriftung verbergen</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
-        <source>Role</source>
-        <translation>Rolle</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (intern)</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
-        <source>Member</source>
-        <translation>Mitglied</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Lesezeichen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Linie</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Geben Sie den Namen des Lesezeichens an.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>Koordinate</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Ungültiger Name für ein Lesezeichen</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Punkt</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Lesezeichenname darf nicht leer sein.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>%1 Punkte</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Achtung: Lesezeichen mit diesem Namen existiert bereits</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
-        <source>Length</source>
-        <translation>Länge</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Geben Sie einen neuen Namen an, oder brechen Sie ab. Ansonsten wird das Lesezeichen überschrieben.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
-        <source>Closed way</source>
-        <translation>Geschlossene Linie</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Lesezeichen entfernen</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>Size</source>
-        <translation>Größe</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Wählen Sie das Lesezeichen, das Sie entfernen möchten.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Fläche</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Ungültige Projektion</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>Höhe</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Projektion "%1" kann nicht eingestellt werden.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>Geschwindigkeit</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>GPS-Fehler</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Punkt</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Der GPS-Port kann nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>Beschreibung</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Öffne NMEA-Logdatei</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>Kommentar</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Tagging-Vorlagen speichern</translation>
     </message>
-</context>
-<context>
-    <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Merkaartor-Taggingvorlagen (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Tagging-Vorlagen öffnen</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="339"/>
-        <source>%1 m/pixel</source>
-        <translation>%1 m/Pixel</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation>Achtung! Die Merkaartor-Übersetzung für "%1" konnte nicht geladen werden. Es wird Englisch verwendet.</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="345"/>
-        <source>Align: %1m @ %2</source>
-        <translation>Ausrichten: %1m @ %2</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Unaufgelöste Konflikte</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="351"/>
-        <source>%1ms</source>
-        <translation>%1ms</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Bitte lösen Sie zuerst die vorhandenen Konflikte auf</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
-        <source>View</source>
-        <translation>Ansicht</translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Ist es sehr empfehlenswert nach dem Hochladen die Änderungen in Ihrem Dokument zu speichern.
+Wollen Sie dies jetzt erledigen?</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
-        <source>Bounding Box</source>
-        <translation>Koordinatenbereich</translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Merkmale für mehrere Objekte setzen</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
-        <source>Projection</source>
-        <translation>Projektion</translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Setze Merkmale für %1</translation>
     </message>
 </context>
 <context>
-    <name>MerkaartorPreferences</name>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Neuer Server</translation>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
+        <source><i>V: </i><b>%1</b> </source>
+        <translation><i>V: </i><b>%1</b> </translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
-        <source>Preferences upload failed</source>
-        <translation>Hochladen der Einstellungen fehlgeschlagen</translation>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
+        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
+        <translation><i>Stand: </i><b>%1</b&gt; von <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <source>Duplicate key</source>
-        <translation>Schlüssel duplizieren</translation>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>Stand: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
-        <source>More than 150 preferences</source>
-        <translation>Mehr als 150 Einstellungen</translation>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
+        <source><br/><i>layer: </i><b>%1</b> </source>
+        <translation><br/><i>Ebene: </i><b>%1</b> </translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Neues Lesezeichen</translation>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
+        <source>Browse</source>
+        <translation>Im Browser anzegen</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Punkt</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>Koordinate</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>Kommentar</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Punkt</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>Höhe</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>Geschwindigkeit</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>size</source>
+        <translation>Größe</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>members</source>
+        <translation>Mitglieder</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
+        <source>Topleft</source>
+        <translation>Oben Links</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
+        <source>Botright</source>
+        <translation>Unten rechts</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
+        <source>Relation</source>
+        <translation>Relation</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
+        <source>Role</source>
+        <translation>Rolle</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
+        <source>Member</source>
+        <translation>Mitglied</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="903"/>
+        <source>Closed way</source>
+        <translation>Geschlossene Linie</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="906"/>
+        <source>Length</source>
+        <translation>Länge</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>Size</source>
+        <translation>Größe</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>%1 Punkte</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Fläche</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Linie</translation>
+    </message>
+</context>
+<context>
+    <name>MapView</name>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="339"/>
+        <source>%1 m/pixel</source>
+        <translation>%1 m/Pixel</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="345"/>
+        <source>Align: %1m @ %2</source>
+        <translation>Ausrichten: %1m @ %2</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="351"/>
+        <source>%1ms</source>
+        <translation>%1ms</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
+        <source>View</source>
+        <translation>Ansicht</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <source>Bounding Box</source>
+        <translation>Koordinatenbereich</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
+        <source>Projection</source>
+        <translation>Projektion</translation>
+    </message>
+</context>
+<context>
+    <name>MerkaartorPreferences</name>
+    <message>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Neues Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
+        <source>Preferences upload failed</source>
+        <translation>Hochladen der Einstellungen fehlgeschlagen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <source>Duplicate key</source>
+        <translation>Schlüssel duplizieren</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
+        <source>More than 150 preferences</source>
+        <translation>Mehr als 150 Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Neuer Server</translation>
     </message>
 </context>
 <context>
@@ -4860,17 +4892,17 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Klasse</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Unbekanntes Feld</translation>
     </message>
@@ -4883,25 +4915,10 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
         <translation>Fehler!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Server für Namenssuche nicht gefunden.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Server für Namenssuche hat Verbindung abgelehnt.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Server für Namenssuche benötigt Beglaubigung.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Unbekannter Fehler.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4922,11 +4939,6 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation>PDF Dateien (*.pdf)</translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4934,6 +4946,11 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation>PDF Dateien (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -5045,59 +5062,20 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Immer</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Farbe auswählen</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Kartenstil-Editor</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
-        <source>Add</source>
-        <translation>Hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
-        <source>Tag selection</source>
-        <translation>Auswahlausdruck</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
-        <source>meter/pixel</source>
-        <translation>Meter/Pixel</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
-        <source>Visible up to</source>
-        <translation>Sichtbar bis zu</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
+        <source>Global</source>
+        <translation>Global</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
-        <source>Visible from scale</source>
-        <translation>Sichtbar ab Massstab</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
+        <source>Background</source>
+        <translation>Hintergrund</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
@@ -5116,6 +5094,11 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
         <translation>…</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation>Punkte</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
@@ -5136,26 +5119,19 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
         <translation>Feste Breite</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
-        <source>Dashed</source>
-        <translation>Strichliert</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
-        <source>off</source>
-        <translation>von</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
+        <source>Add</source>
+        <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
-        <source>Fill area</source>
-        <translation>Fläche füllen</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
-        <source>Draw icon</source>
-        <translation>Symbol zeichnen</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
@@ -5163,20 +5139,25 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
         <translation>Duplizieren</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
-        <source>Background</source>
-        <translation>Hintergrund</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
+        <source>Tag selection</source>
+        <translation>Auswahlausdruck</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation>Punkte</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
+        <source>meter/pixel</source>
+        <translation>Meter/Pixel</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
+        <source>Visible up to</source>
+        <translation>Sichtbar bis zu</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
+        <source>Visible from scale</source>
+        <translation>Sichtbar ab Massstab</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5186,6 +5167,23 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
         <translation>Farbe</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
+        <source>Dashed</source>
+        <translation>Strichliert</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
+        <source>off</source>
+        <translation>von</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
+        <source>Fill area</source>
+        <translation>Fläche füllen</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
         <translation>Mit Symbolen füllen (definiert bei Details)</translation>
@@ -5216,6 +5214,11 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
         <translation>Stufen zeichnen</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
+        <source>Draw icon</source>
+        <translation>Symbol zeichnen</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
         <translation>Zeichne Fahrtrichtungsmarkierungen</translation>
@@ -5236,6 +5239,16 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
         <translation>Beschriftungsmerkmal</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
+        <source>Halo</source>
+        <translation>Halo</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
+        <source>Area</source>
+        <translation>Fläche</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
         <translation>Hintergrundfarbe</translation>
@@ -5246,19 +5259,23 @@ Möchten Sie trotzdem für jeden Schnittpunkt eine Kreuzung erstellen (ungewollt
         <translation>Beschriftung mit Hintergrund-Merkmal</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
-        <source>Halo</source>
-        <translation>Halo</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
-        <source>Area</source>
-        <translation>Fläche</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Immer</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
-        <source>Global</source>
-        <translation>Global</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Farbe auswählen</translation>
     </message>
 </context>
 <context>
@@ -5309,6 +5326,11 @@ Was wollen sie als nächstes tun?</translation>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5322,6 +5344,11 @@ Was wollen sie als nächstes tun?</translation>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>SVG-Dateien (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
         <translation>Alle Dateien (*)</translation>
@@ -5331,16 +5358,6 @@ Was wollen sie als nächstes tun?</translation>
         <source>Image files (*.png *.jpg)</source>
         <translation>Bilddateien (*.png *.jpg)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVG-Dateien (*.svg)</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -5370,6 +5387,137 @@ Was wollen sie als nächstes tun?</translation>
         <translation>Durchsichtigkeit niedrig/hoch</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
+        <source>Single mouse button interaction</source>
+        <translation>Bedienung mit einer Maustaste</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
+        <source>Use custom Qt style</source>
+        <translation>Eigener Qt-Stil:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation>Erstellen neuer Punkte/Linien im Auswahlmodus zulassen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Separater Verschieben-Modus</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Virtuelle Punkte (neue Sitzung erforderlich)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Versteckte Relationen auswählbar</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
+        <source>Background</source>
+        <translation>Hintergrund</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
+        <source>...</source>
+        <translation>…</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
+        <source>Overwrite style</source>
+        <translation>Stil ersetzen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>GPS-Spur</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
+        <source>Pixels</source>
+        <translation>Pixel</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Einfache Darstellung der GPS-Spur</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Schnittstelle</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Darüberhalten</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Relationen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Fokus</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Hervorheben</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation>Ungespeichert</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Sprache</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Sie müssen das Programm möglicherweise neustarten, damit die Änderungen wirksam werden.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Sprache:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Tagging-Vorlagen übersetzen</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
         <translation>Darstellung</translation>
@@ -5390,6 +5538,16 @@ Was wollen sie als nächstes tun?</translation>
         <translation>Anti-alisaing beim Verscheiben ausschalten</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
+        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
+        <source>Use current style for wireframe rendering</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
         <translation>Bearbeitungmodus</translation>
@@ -5415,79 +5573,67 @@ Was wollen sie als nächstes tun?</translation>
         <translation>Kartenstil</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Benutzerdefiniert</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation>Vorlage automatisch laden</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation>GDAL</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation>Projektion bestätigen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Eigenes Verzeichnis für Stile</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Kennwort:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Aktueller Stil</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Netzwerk</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Stile für GPS-Ebenen deaktivieren</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Proxy-Einstellungen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Vorlage</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Proxy verwenden</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Tagging-Vorlage</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Host:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Eingebaut</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation>Port:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Benutzerdefiniert</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Hintergrundbild</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
-        <translation>Cache-Verzeichnis</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
+        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
+        <translation>OSM API (URL ist z.B. "http://www.openstreetmap.org/api/0.6")</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Cache-Größe (in MB; 0 um keinen Cache zu verwenden)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
+        <source>XAPI</source>
+        <translation>XAPI</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
-        <translation>Kartenadapter</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Daten</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
+        <source>Nominatim (Geo Search)</source>
+        <translation>Nominatim (Geo-Suche)</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
@@ -5495,16 +5641,16 @@ Was wollen sie als nächstes tun?</translation>
         <translation>Dokumente</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation>Vorlage automatisch laden</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
         <source>Autosave documents after upload</source>
         <translation>Dokumente nach dem Hochladen automatisch speichern</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Eingebaut</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
         <source>Tracks</source>
         <translation>GPS-Spuren</translation>
@@ -5515,179 +5661,135 @@ Was wollen sie als nächstes tun?</translation>
         <translation>Spuren beim Öffnen automatisch extrahieren</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Stile für GPS-Ebenen deaktivieren</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Farbe auswählen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Werkzeug existiert bereits</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Ein Werkzeug dieses Namens existiert bereits.
-Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das bestehende zu modifizieren</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Kann Werkzeug nicht löschen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Kann Werkzeug "%1" nicht löschen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Kann den Namen des Werkzeugs nicht ändern</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
+        <source>Track layers readonly by default</source>
+        <translation>GPS-Spur-Ebenen per Vorgabe schreibgeschützt</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Kann den Namen von Werkzeug "%1" nicht ändern</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
+        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
+        <translation>Keine GPX-Punkte verbinden, die weiter auseinander liegen als (in km; 0 zum Deaktivieren)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Werkzeugprogramm wählen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation>GDAL</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation>Vorlage auswählen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation>Projektion bestätigen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation>Merkaartor Dokument (*.mdc)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Log-Verzeichnis wählen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>GPS-Input</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
-        <source>Colors</source>
-        <translation>Farben</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>GPSD</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
-        <source>Background</source>
-        <translation>Hintergrund</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Seriell</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Darüberhalten</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Fokus</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Relationen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
+        <source>Save NMEA log</source>
+        <translation>NMEA-Log speichern</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation>Erstellen neuer Punkte/Linien im Auswahlmodus zulassen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation>Computer-Uhr mit GPS sychronisieren</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
-        <source>...</source>
-        <translation>…</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation>Ungespeichert</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation>Proxy-Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
-        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation>Proxy verwenden</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
-        <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Kennwort:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
-        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation>OSM API (URL ist z.B. "http://www.openstreetmap.org/api/0.6")</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Benutzer:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
-        <source>XAPI</source>
-        <translation>XAPI</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
-        <source>Nominatim (Geo Search)</source>
-        <translation>Nominatim (Geo-Suche)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation>Netzwerk Timeout (Sek.)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation>JOSM-kompatiblen lokalen Server auf Port 8111 aktivieren</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
-        <source>Save NMEA log</source>
-        <translation>NMEA-Log speichern</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation>Hintergrundbild</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation>Computer-Uhr mit GPS sychronisieren</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation>Kachelpuffer (aus rechtlichen Gründen für Yahoo deaktiviert)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
-        <translation>Netzwerk Timeout (Sek.)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation>Cache-Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>JOSM-kompatiblen lokalen Server auf Port 8111 aktivieren</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation>Cache-Größe (in MB; 0 um keinen Cache zu verwenden)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation>Kartenadapter</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
@@ -5725,98 +5827,6 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Sprache</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Sie müssen das Programm möglicherweise neustarten, damit die Änderungen wirksam werden.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Sprache:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Tagging-Vorlagen übersetzen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
-        <source>Pixels</source>
-        <translation>Pixel</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Separater Verschieben-Modus</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
-        <source>Single mouse button interaction</source>
-        <translation>Bedienung mit einer Maustaste</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
-        <source>Use custom Qt style</source>
-        <translation>Eigener Qt-Stil:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
-        <source>Overwrite style</source>
-        <translation>Stil ersetzen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Vorlage</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Tagging-Vorlage</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
-        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation>Keine GPX-Punkte verbinden, die weiter auseinander liegen als (in km; 0 zum Deaktivieren)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Kachelpuffer (aus rechtlichen Gründen für Yahoo deaktiviert)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartor-Taggingvorlage (*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
-        <source>Track layers readonly by default</source>
-        <translation>GPS-Spur-Ebenen per Vorgabe schreibgeschützt</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Eigenes Verzeichnis für Stile</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Aktueller Stil</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
         <source>English</source>
         <translation>Englisch</translation>
@@ -5837,6 +5847,11 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Tschechisch</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Niederländisch</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
         <translation>Deutsch</translation>
@@ -5867,6 +5882,11 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Polnisch</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Portugiesisch</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
         <source>Brazilian Portuguese</source>
         <translation>Brasilianisches Portugiesisch</translation>
@@ -5877,95 +5897,86 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Russisch</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Benutzer:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Hervorheben</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>GPS-Spur</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Slowakisch</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Einfache Darstellung der GPS-Spur</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Spanisch</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>GPS-Input</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Schwedisch</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>GPSD</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>Ukrainisch</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Seriell</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartor-Taggingvorlage (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Farbe auswählen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Server</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Werkzeug existiert bereits</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Virtuelle Punkte (neue Sitzung erforderlich)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Ein Werkzeug dieses Namens existiert bereits.
+Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das bestehende zu modifizieren</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Niederländisch</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Kann Werkzeug nicht löschen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Portugiesisch</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Kann Werkzeug "%1" nicht löschen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Slowakisch</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Kann den Namen des Werkzeugs nicht ändern</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Spanisch</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Kann den Namen von Werkzeug "%1" nicht ändern</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Schwedisch</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Werkzeugprogramm wählen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>Ukrainisch</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation>Vorlage auswählen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Versteckte Relationen auswählbar</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation>Merkaartor Dokument (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Schnittstelle</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Log-Verzeichnis wählen</translation>
     </message>
 </context>
 <context>
@@ -6057,20 +6068,20 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>WKT</translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
         <translation>Fehler in der WKT Zeichenkette</translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
         <translation>Kann nicht im PROJ4 format exportieren</translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
         <translation>Ungültige WKT Zeichenkette</translation>
     </message>
@@ -6086,10 +6097,19 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
 <context>
     <name>PropertiesDock</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
-        <source>Properties</source>
-        <translation>Eigenschaften</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
+        <source>%1/%1 selected item(s)</source>
+        <translation>%1/%1 gewählte(n) Elemente(n)</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
+        <source>%1/%2 selected item(s)</source>
+        <translation>%1/%2 gewählte(n) Elemente(n)</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
+        <source>Selected items</source>
+        <translation>Ausgewählte Elemente</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
@@ -6097,9 +6117,9 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Eigenschaften - Mehrere Elemente</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
-        <source>Properties - Relation</source>
-        <translation>Eigenschaften - Relation</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Eigenschaften - Punkte</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
@@ -6107,29 +6127,15 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Eigenschaften - Linie</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
-        <source>Center map</source>
-        <translation>Zentriere Karte</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
-        <source>Center && Zoom map</source>
-        <translation>Zentriere && zoome Karte</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
-        <source>%1/%1 selected item(s)</source>
-        <translation>%1/%1 gewählte(n) Elemente(n)</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
-        <source>%1/%2 selected item(s)</source>
-        <translation>%1/%2 gewählte(n) Elemente(n)</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
+        <source>Properties - Relation</source>
+        <translation>Eigenschaften - Relation</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
-        <source>Selected items</source>
-        <translation>Ausgewählte Elemente</translation>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
+        <source>Properties</source>
+        <translation>Eigenschaften</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
@@ -6137,42 +6143,24 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Fehler beim Laden der Vorlage</translation>
     </message>
     <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
+        <source>Center map</source>
+        <translation>Zentriere Karte</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
+        <source>Center && Zoom map</source>
+        <translation>Zentriere && zoome Karte</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
         <source>Select member</source>
         <translation>Mitglied auswählen</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Eigenschaften - Punkte</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation>Exportiere GPX...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation>Importieren…</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation>Importiert: %1</translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Kaskadiertes Aufräumen</translation>
@@ -6198,7 +6186,30 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Punkt %1 verschieben</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation>Exportiere GPX...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation>Importieren…</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation>Importiert: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>osmChange importieren</translation>
     </message>
@@ -6208,29 +6219,29 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>NGT importieren</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>NMEA importieren</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
         <translation>Bing Straßen-Erkennung</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
         <translation>Bekomme keine Ausgabe.</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
         <translation>keine gültigen Daten.</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
         <translation>Kann die Ausgabe nicht interpretieren.</translation>
     </message>
@@ -6296,12 +6307,12 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Fehler in GPS-Aufzeichnung</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>GPS-Logdatei %1 kann nicht erstellt werden.</translation>
     </message>
@@ -6309,17 +6320,17 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>Verbindung zu %1:%2 nicht möglich</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Fehler in GPS-Aufzeichnung</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>GPS-Logdatei %1 kann nicht erstellt werden.</translation>
     </message>
@@ -6405,95 +6416,139 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< T R E N N E R ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>Symbolleisten anpassen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Aktionen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation>Symbolleisten</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation>Alles wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation>Herunter</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
         <translation>Aktuelle Aktionen</translation>
     </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< T R E N N E R ></translation>
+    </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation>Eigene Symbolleiste</translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation>Datei konnte mit gzopen() nicht geöffnet werden</translation>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6511,6 +6566,14 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Ausgewählte Mitglieder entfernen</translation>
     </message>
     <message>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
+        <source>...</source>
+        <translation>…</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
         <translation>Merkmale</translation>
@@ -6530,14 +6593,6 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <source>Remove selected tag(s)</source>
         <translation>Ausgewählte(s) Merkmal(e) löschen</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
-        <source>...</source>
-        <translation>…</translation>
-    </message>
 </context>
 <context>
     <name>RoadProperties</name>
@@ -6618,6 +6673,11 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <translation>Name</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>ID</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
         <translation>Abfrage</translation>
@@ -6627,11 +6687,6 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <source>Maximum returned results (0 for all)</source>
         <translation>Max. Resultate (0=Alle)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>ID</translation>
-    </message>
 </context>
 <context>
     <name>SlippyMapWidget</name>
@@ -6644,12 +6699,12 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
         <translation>Ebene aktualisieren</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
@@ -6673,6 +6728,16 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>Zu Openstreetmap hochladen</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation>Bitte geben Sie einen Kommentar für die Änderungen ein.</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>Bitte überprüfen Sie sorgfältig die Änderungen, die an OSM gesendet werden.</translation>
@@ -6687,16 +6752,6 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Zu Openstreetmap hochladen</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Bitte geben Sie einen Kommentar für die Änderungen ein.</translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
@@ -6740,7 +6795,7 @@ Wählen Sie einen anderen Namen oder klicken Sie auf <Übernehmen>, um das
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6754,6 +6809,21 @@ p, li { white-space: pre-wrap; }
         <translation>Projektion:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Breite/Länge (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>Ursprung ist unten links</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
         <translation>Kachelgröße:</translation>
@@ -6779,21 +6849,6 @@ p, li { white-space: pre-wrap; }
         <translation>URL der Lizenz:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Breite/Länge (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>Ursprung ist unten links</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
@@ -6809,24 +6864,18 @@ p, li { white-space: pre-wrap; }
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: GetServices</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Adresse und Pfad dürfen nicht leer sein.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Herunterladen fehlgeschlagen: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Fehler beim Lesen der Services.
@@ -6966,55 +7015,55 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Auszug - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation>Anzahl GPS-Spur-Segmente</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Gesamtdistanz</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Gesamtdauer</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Auszug - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Zeichnungsebene extrahieren</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
@@ -7113,12 +7162,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
@@ -7126,35 +7175,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: GetCapabilities</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adresse und Pfad dürfen nicht leer sein.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Herunterladen fehlgeschlagen: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation>Unbenannt</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Fehler beim Abrufen der Fähigkeiten.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>WMS-Server einrichten</translation>
@@ -7175,31 +7195,26 @@ p, li { white-space: pre-wrap; }
         <translation>Name:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>Server-URL:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>Ebenen:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>Projektion:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>Bildformat:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Stile:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -7208,6 +7223,11 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Dies ist ein zwischenspeichernder WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600 [...]
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>Projektion:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
         <translation>Kacheln</translation>
@@ -7218,6 +7238,16 @@ p, li { white-space: pre-wrap; }
         <translation>Zoomstufen</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation>Bildformat:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Stile:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
         <translation>Wert für "source" Merkmal:</translation>
@@ -7243,14 +7273,33 @@ p, li { white-space: pre-wrap; }
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>Server-URL:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: GetCapabilities</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Adresse und Pfad dürfen nicht leer sein.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Fehler beim Abrufen der Fähigkeiten.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Herunterladen fehlgeschlagen: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation>Unbenannt</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_et.ts b/translations/merkaartor_en.ts
similarity index 83%
copy from translations/merkaartor_et.ts
copy to translations/merkaartor_en.ts
index 2ea3e6f..d1dc196 100644
--- a/translations/merkaartor_et.ts
+++ b/translations/merkaartor_en.ts
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="et">
+<TS version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="14"/>
         <source>About Merkaartor</source>
-        <translation>Teave Merkaartor'ist</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="30"/>
@@ -15,7 +15,7 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -29,7 +29,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -38,7 +38,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -47,22 +47,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -71,12 +71,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
-        <translation>Muudatuste logi</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,90 +84,120 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
-        <translation>&Import</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
-        <translation>&Eksport</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
-        <translation>&Vaikimisi</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
-        <translation>&OK</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
-        <translation>&Katkesta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
-        <translation>%1 ei saa avada.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
-        <translation>%1 ei saa kirjutamiseks avada.</translation>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -226,7 +256,6 @@ p, li { white-space: pre-wrap; }
         <source>There are <b>%n</b> dirty objects</source>
         <translation type="unfinished">
             <numerusform></numerusform>
-            <numerusform></numerusform>
         </translation>
     </message>
     <message>
@@ -264,13 +293,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
         <source>Cleanup</source>
-        <translation>Nullimine</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -469,95 +498,95 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -577,7 +606,7 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="40"/>
         <source>Bookmark</source>
-        <translation>Järjehoidja</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="62"/>
@@ -613,79 +642,72 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
         <source>%1 download</source>
-        <translation>%1 allalaadimine</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
         <source>Downloading unresolved...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
         <source>Downloading unresolved %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
         <source>Parsing unresolved %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
         <source>Parsing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
         <source>Empty roads/relations detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
         <source>Empty roads/relations are probably errors.
 Do you want to mark them for deletion?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
         <source>Remove empty feature %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
@@ -707,94 +729,94 @@ Before being able to upload your changes, you will have to manually merge the tw
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
-            <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
-            <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
         <source>Downloading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
         <source>Downloading from OSM (connecting)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
         <source>Username/password invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Unresolved conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Please resolve existing conflicts first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
         <source>Downloading trackpoints %1-%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
         <source>Downloaded track - nodes %1-%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
         <source>MapDust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -806,12 +828,12 @@ API message is '%1'</source>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -819,33 +841,33 @@ API message is '%1'</source>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
         <translation type="unfinished"></translation>
     </message>
@@ -928,7 +950,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="445"/>
         <source>All</source>
-        <translation>Kõik</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -974,13 +996,13 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1015,17 +1037,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="127"/>
         <source>Apply</source>
-        <translation>Rakenda</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="134"/>
         <source>Add</source>
-        <translation>Lisa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="141"/>
@@ -1036,232 +1058,232 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
         <source>Network timeout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
         <source>Cannot read the photo's details from the Walking Papers server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
         <source>Please specify Walking Papers URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
         <source>Center map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
         <source>Save geotagged image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
         <source>Photo layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints found for image "%1"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation type="unfinished"></translation>
@@ -1270,32 +1292,6 @@ Do you still want to use it?</source>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation type="unfinished"></translation>
@@ -1303,7 +1299,7 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="28"/>
         <source>Bookmark</source>
-        <translation>Järjehoidja</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
@@ -1351,51 +1347,77 @@ Do you still want to use it?</source>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1403,71 +1425,71 @@ Do you still want to use it?</source>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
 As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1475,104 +1497,6 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 ei saa avada.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 ei ole CSV impordi sätete fail</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 ei saa kirjutamiseks avada.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
@@ -1712,52 +1636,147 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Layer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n tunnus</numerusform>
-            <numerusform>%n tunnust</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>LayerDock</name>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImportExportGdal</name>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InfoDock</name>
+    <message>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LayerDock</name>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
@@ -1793,7 +1812,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="401"/>
         <source>All</source>
-        <translation>Kõik</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
@@ -1819,61 +1838,61 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LicenseDisplayDialog</name>
@@ -1904,14 +1923,14 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1919,2589 +1938,2605 @@ Initializing...</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 ei saa avada.</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Lisa tänava number</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Katkesta</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 ei saa kirjutamiseks avada.</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 pole õige Merkaartori dokument.</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Lisa järjehoidja</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Abi</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Loo</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Redigeerimine</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Vaade</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Järjehoidjad</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Fail</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Eksport</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Stiil</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Aken</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Välju</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&Info</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Ava</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Võta tagasi</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Tee uuesti</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Liiguta</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Import</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>Allalaa&dimine</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Vali</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Lae üles</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Mine...</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Uus</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Liitu</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Jaga kaheks</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Ala</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Redigeeri...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Salvesta...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Lae...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Eelistused...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Kõik...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Otsi...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>Lis&a...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Eemalda...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Liida</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Salvesta</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Omadused</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Info</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Joonda</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Sõlmede joondamine</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopeeri</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Käivita</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Ühenda...</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Lisa liige</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Eemalda liige</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Mitte kunagi</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Alati</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Haagi lahti</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Töötamine võrguta</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Stiilid</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Kaamera</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>&Puudub</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Unresolved conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Please resolve existing conflicts first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
         <source>It is strongly recommended to save the changes to your document after an upload.
 Do you want to do this now?</source>
         <translation type="unfinished"></translation>
@@ -4518,143 +4553,138 @@ Do you want to do this now?</source>
         <source>Set Tags on %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
         <source>Waypoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
         <source>coord</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
-        <translation>%1 punkti</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
-        <translation>Ala</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4662,16 +4692,6 @@ Do you want to do this now?</source>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
         <translation type="unfinished"></translation>
@@ -4687,17 +4707,27 @@ Do you want to do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4711,19 +4741,29 @@ Do you want to do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <source>Duplicate key</source>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <source>Duplicate key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
+        <source>More than 150 preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
-        <source>More than 150 preferences</source>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4750,7 +4790,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="53"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="73"/>
@@ -4761,17 +4801,17 @@ Do you want to do this now?</source>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4784,25 +4824,10 @@ Do you want to do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4823,14 +4848,14 @@ Do you want to do this now?</source>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
+        <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
-        <source>untitled</source>
+        <source>PDF files (*.pdf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4838,7 +4863,7 @@ Do you want to do this now?</source>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
@@ -4930,7 +4955,7 @@ Do you want to do this now?</source>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="35"/>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="46"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="74"/>
@@ -4946,25 +4971,6 @@ Do you want to do this now?</source>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Alati</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation type="unfinished"></translation>
@@ -4978,7 +4984,7 @@ Do you want to do this now?</source>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
         <source>Background</source>
-        <translation>Tagapõhi</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
@@ -4994,7 +5000,32 @@ Do you want to do this now?</source>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1363"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1608"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
@@ -5004,7 +5035,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
         <source>Add</source>
-        <translation>Lisa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
@@ -5045,31 +5076,6 @@ Do you want to do this now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5149,270 +5155,120 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
         <source>Area</source>
-        <translation>Ala</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
-        <source>Draw with background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
-        <source>Label with background tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PhotoLoadErrorDialog</name>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
-        <source>No Valid geotag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
-        <source>This photo does not contain geo-tagging EXIF data.
-What do you want to do next?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
-        <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
-        <source>Load without associated node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
-        <source>Extract info from barcode (Walking Papers)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
-        <source>Ignore it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
-        <source>Do this for all current photos.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PictureViewerDialog</name>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>untitled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Araabia</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Portugali (Brasiilia)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
+        <source>Draw with background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
+        <source>Label with background tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PhotoLoadErrorDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
+        <source>No Valid geotag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
+        <source>This photo does not contain geo-tagging EXIF data.
+What do you want to do next?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
+        <source>Try to match with a track node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
+        <source>Load without associated node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
+        <source>Extract info from barcode (Walking Papers)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
+        <source>Ignore it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
+        <source>Do this for all current photos.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PictureViewerDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Output filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
         <source>Preferences</source>
@@ -5476,7 +5332,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
         <source>Background</source>
-        <translation>Tagapõhi</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
@@ -5492,7 +5348,7 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
@@ -5625,6 +5481,12 @@ Please select another name or click the <Apply> button if you want to modi
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
         <source>Current style</source>
         <translation type="unfinished"></translation>
@@ -5640,9 +5502,15 @@ Please select another name or click the <Apply> button if you want to modi
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
         <source>Built-in</source>
-        <translation>Sisseehitatud</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
@@ -5762,108 +5630,259 @@ Please select another name or click the <Apply> button if you want to modi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
+        <source>Automatically add "source" tag when creating features over a background map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
+        <source>Tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Taustapilt</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
-        <source>Automatically add "source" tag when creating features over a background map</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
-        <source>Tools</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
-        <source>Name:</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
-        <source>Path:</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
-        <source>Apply</source>
-        <translation>Rakenda</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
-        <source>Add</source>
-        <translation>Lisa</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
-        <source>Remove</source>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5897,17 +5916,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="127"/>
         <source>Apply</source>
-        <translation>Rakenda</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="134"/>
         <source>Add</source>
-        <translation>Lisa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="141"/>
@@ -5956,20 +5975,20 @@ Please select another name or click the <Apply> button if you want to modi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5987,12 +6006,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
         <source>%1/%1 selected item(s)</source>
-        <translation>%1/%1 valitut</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
         <source>%1/%2 selected item(s)</source>
-        <translation>%1/%2 valitut</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
@@ -6049,29 +6068,6 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Katkesta</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation type="unfinished"></translation>
@@ -6097,7 +6093,30 @@ Please select another name or click the <Apply> button if you want to modi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6107,29 +6126,29 @@ Please select another name or click the <Apply> button if you want to modi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6174,12 +6193,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgps.cpp" line="153"/>
         <source>2D</source>
-        <translation>2D</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="156"/>
         <source>3D</source>
-        <translation>3D</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
@@ -6195,12 +6214,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6208,17 +6227,17 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6240,7 +6259,7 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="63"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="80"/>
         <source>99 99' 99"</source>
-        <translation>99 99' 99"</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="70"/>
@@ -6250,22 +6269,22 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="87"/>
         <source>Altitude</source>
-        <translation>Kõrgus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="97"/>
         <source>1000 meter</source>
-        <translation>1000 meetrit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="104"/>
         <source># Satellites</source>
-        <translation># Satelliti</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="114"/>
         <source>00</source>
-        <translation type="unfinished">00</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="121"/>
@@ -6285,7 +6304,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="148"/>
         <source>000 km/h</source>
-        <translation>000 km/h</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="155"/>
@@ -6304,95 +6323,139 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< E R A L D A J A  ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation>Tegevused</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
-        <translation>Rakenda</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
-        <translation>Katkesta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
-        <translation><-</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
-        <translation>-></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6415,7 +6478,7 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
@@ -6478,7 +6541,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6509,7 +6572,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="45"/>
         <source>=</source>
-        <translation>=</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="55"/>
@@ -6543,12 +6606,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6594,35 +6657,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="73"/>
         <source>Cancel</source>
-        <translation>Katkesta</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
-        <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
-        <source>Error reading services.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
         <source>TMS servers setup</source>
         <translation type="unfinished"></translation>
@@ -6714,18 +6754,35 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
-        <translation>Rakenda</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="296"/>
         <source>Add</source>
-        <translation>Lisa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="303"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
+        <source>Merkaartor: GetServices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
+        <source>Error reading services.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TagModel</name>
@@ -6760,7 +6817,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
         <source>AND</source>
-        <translation>JA</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
@@ -6770,7 +6827,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
@@ -6860,55 +6917,55 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
         <source>Extract - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
-        <translation># rajaosa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
-        <translation>%1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
-        <translation>%1 km</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
-        <translation>%1t %2m</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6963,7 +7020,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7001,53 +7058,25 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="104"/>
         <source>99999; </source>
-        <translation>99999; </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
-        <translation>Tühi</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation type="unfinished"></translation>
@@ -7080,7 +7109,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
         <source>1</source>
-        <translation>1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
@@ -7129,17 +7158,45 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
         <source>Apply</source>
-        <translation>Rakenda</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="341"/>
         <source>Add</source>
-        <translation>Lisa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="348"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/merkaartor_es.ts b/translations/merkaartor_es.ts
index bfe8859..a9b98fd 100644
--- a/translations/merkaartor_es.ts
+++ b/translations/merkaartor_es.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="es">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,57 +24,57 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
         <translation>Etiqueta de texto</translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
         <translation>Este programa esta licenciado bajo la Licencia Publica GNU v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Registro de cambios</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>Aceptar</translation>
     </message>
@@ -84,93 +82,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Atajo</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Exportar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>Pre&determinado</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&Aceptar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Editor de Atajos</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Cargar esquema de Atajo</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Esquema de atajos Merkaator (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Incapaz de abrir archivo</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 no pudo ser abierto</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Guardar esquema de Atajos</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>sin nombre</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>No se puede abrir el archivo</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 no pudo ser abierto para su escritura.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -214,20 +242,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -257,9 +282,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -270,7 +295,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
@@ -359,6 +384,11 @@ API message is '%1'</source>
 El mensaje de la API es '%1'</translation>
     </message>
     <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="464"/>
+        <source>Uploading changes...</source>
+        <translation>Subiendo cambios...</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="490"/>
         <source>OPEN changeset</source>
         <translation>ABRIR cambios</translation>
@@ -368,11 +398,6 @@ El mensaje de la API es '%1'</translation>
         <source>CLOSE changeset</source>
         <translation>CERRAR cambios</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="464"/>
-        <source>Uploading changes...</source>
-        <translation>Subiendo cambios...</translation>
-    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -407,7 +432,7 @@ El mensaje de la API es '%1'</translation>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
@@ -473,97 +498,97 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>sin nombre</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Capa sucia</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Capa actualizada</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Imágenes de Fondo</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Capa Dibujo #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Capa Filtro #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>Exportar OSM</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Exportando OSM...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Documento</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -591,12 +616,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -617,245 +642,234 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Descarga fallida</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 descarga</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>error</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Descargando no resueltos...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>No descargó suficiente</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Descargando desde OSM (%n bytes)</numerusform>
-            <numerusform>Descargando desde OSM (%n bytes)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Descargando desde OSM (%n kBytes)</numerusform>
-            <numerusform>Descargando desde OSM (%n kBytes)</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Descargando 'no resueltos' %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Descargando desde OSM (conectando)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Analisis no resuelto %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation>Código de estado de http inesperado (%1)
-El mensaje del servidor es '%2'</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Analizando...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation>
-El mensaje de la API es '%1'</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>Analizar XML</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Nombre de usuario/contraseña inválido</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Conflictos desde %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Conflictos no resueltos</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>caminos/relaciones vacios detectados</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Resuelva primero los conflictos existentes</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Carreteras o relaciones vacías podrían significar errores.
+¿Desea marcarlos para su borrado?</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Remover caracteristica vacia %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>Se han detectado conflictos</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Descargando puntos</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation>Esto significa que algunos de los atributos que ha modificado desde su ultima descarga han sido modificadas por alguien mas en el servidor.Los atributos han sido duplicados como "conflicto..." en las capas "conflictos.
+Antes de que sea capaz de cargar sus cambios,tendra que combinar manualmente las dos versiones y quitar el primero de la capa "conflictos..."</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>Analizar XML</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Subiendo...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Descargando puntos de ruta %1-%2</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Preparando cambios</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Ruta descargada - nodos %1-%2</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Esperando respuesta del servidor</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 descarga</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>error</translation>
     </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Descargando 'no resueltos' %1 de %2</translation>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Analisis no resuelto %1 de %2</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Descargando...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Conflictos desde %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Descargando desde OSM (conectando)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>Se han detectado conflictos</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation>Código de estado de http inesperado (%1)
+El mensaje del servidor es '%2'</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation>Esto significa que algunos de los atributos que ha modificado desde su ultima descarga han sido modificadas por alguien mas en el servidor.Los atributos han sido duplicados como "conflicto..." en las capas "conflictos.
-Antes de que sea capaz de cargar sus cambios,tendra que combinar manualmente las dos versiones y quitar el primero de la capa "conflictos..."</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation>
+El mensaje de la API es '%1'</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>caminos/relaciones vacios detectados</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Descarga fallida</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Carreteras o relaciones vacías podrían significar errores.
-¿Desea marcarlos para su borrado?</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Nombre de usuario/contraseña inválido</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Remover caracteristica vacia %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Conflictos no resueltos</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Descargando %1,%2 (zoom %3)...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Resuelva primero los conflictos existentes</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Descargando...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Descargando puntos de ruta %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Analizando...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Ruta descargada - nodos %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Descargando no resueltos...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Subiendo...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Descargando puntos</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Preparando cambios</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Esperando respuesta del servidor</translation>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Descargando %1,%2 (zoom %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation>No se puede borrar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede eliminar la selección porque está fuera del area descargada</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede eliminar todo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -909,6 +923,11 @@ Delete what can be?</source>
         <translation>Descargar hijos perdidos</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Agregar a seleccion</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
@@ -933,11 +952,6 @@ Delete what can be?</source>
         <source>All</source>
         <translation>Todo</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Agregar a seleccion</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -988,7 +1002,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
@@ -998,7 +1012,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar filtros</translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
@@ -1044,270 +1058,244 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Tiempo de espera de red</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>No se puede leer los detalles de la foto desde el servidor Walking Papers.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Especifique el URL de Walking Papers</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Geo Imágenes</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Centrar mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Eliminar Imágenes</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Copiar nombre de archivo al portapapeles</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Seleccionar siguiente imagen</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>AvPág</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Seleccionar imagen previa</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>RePág</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Capa de Fotos</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Cargar imágenes geoetiquetadas</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>Elige la capa a la que corresponden las siguientes imágenes:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>La capa es solo lectura</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Cargando imágenes ...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Abortar carga</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
-        <source>Specify offset</source>
-        <translation>Especificar desplazamiento</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>No existe el fichero</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
-        <source>Position images more to the:</source>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>No se puede encontrar la imagen «%1».</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>Error al abrir "%2":
+%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Error en la carga de datos EXIF desde "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
+        <source>Specify offset</source>
+        <translation>Especificar desplazamiento</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
+        <source>Position images more to the:</source>
         <translation>Imágenes en posición más a la:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>fin de la pista</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>Comienzo de la pista</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Sin puntos de ruta</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Puntos de ruta no encontrados para la imagen "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'segundos'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'minutos y' ss 'segundos'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'horas,' mm 'minutos y' ss 'segundos'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>¿Imagen incorrecta?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>La imagen "%1" fue tomada %2 antes de que el siguiente punto de ruta fuera grabado.
 ¿Deseas seguir usándola?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>La imagen "%1" fué tomada %2 después de que el último punto de ruta fuera grabado.
 ¿Deseas seguir usándolo?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>No existe el fichero</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Tiempo de espera de red</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>No se puede leer los detalles de la foto desde el servidor Walking Papers.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Centrar mapa</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Capa de Fotos</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>No se puede encontrar la imagen «%1».</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>Error al abrir "%2":
-%1</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Sin puntos de ruta</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Puntos de ruta no encontrados para la imagen "%1"</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation>Especifique el nombre de archivo</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>JPEG Images (*.jpg)</source>
         <translation>Imágenes JPEG (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Error en la carga de datos EXIF desde "%1".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Error al abrir "%1":
 %2</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Seleccionar siguiente imagen</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>AvPág</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Seleccionar imagen previa</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>RePág</translation>
-    </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>¡La dirección especificada no es válida!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Formato de Coordenadas inválido</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Formato de las coordenadas: '<left lon>, <botton lat>, <right lon>, <top lat>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Formato de las coordenadas: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Ir A</translation>
@@ -1320,17 +1308,17 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1363,51 +1351,77 @@ Do you still want to use it?</source>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>¡La dirección especificada no es válida!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Formato de Coordenadas inválido</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Formato de las coordenadas: '<left lon>, <botton lat>, <right lon>, <top lat>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Formato de las coordenadas: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Adaptar forma</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>Adaptador WMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>Adaptador TMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>Complementos</translation>
     </message>
@@ -1415,71 +1429,71 @@ Do you still want to use it?</source>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Mapa - Ninguno</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Mapa - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Mapa - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Mapa - WMS-Tiled - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Mapa - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Mapa - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Tamaño de la tesela</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Proyección</translation>
     </message>
@@ -1487,104 +1501,6 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Cadena</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Entero</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Número Flotante</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Longitud</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Latitud</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Poyeccion invalida</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Archivo inválido</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 no pudo ser abierto</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 no es un archivo de configuración de importación CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>sin nombre</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Todos los archivos (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 no pudo ser abierto para su escritura.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Diálogo</translation>
@@ -1599,7 +1515,7 @@ Do you really want to exit?</source>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1607,7 +1523,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
@@ -1652,7 +1568,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1662,7 +1578,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation>Comilla simple (')</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
@@ -1672,7 +1588,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
         <source>Projection (in PROJ4 format; leave blank for latitude/longitude)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="227"/>
@@ -1687,7 +1603,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
@@ -1707,12 +1623,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="342"/>
         <source>From (0 from start):</source>
-        <translation type="unfinished"></translation>
+        <translation>Desde (0 desde inicio):</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="352"/>
         <source>To (0 to End):</source>
-        <translation type="unfinished"></translation>
+        <translation>Hasta (0 para fin):</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="367"/>
@@ -1724,18 +1640,116 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Guardando configuraciones...</translation>
     </message>
-</context>
-<context>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Cadena</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Entero</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Número Flotante</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Longitud</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Latitud</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Poyeccion invalida</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Archivo inválido</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 no pudo ser abierto</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 no es un archivo de configuración de importación CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>sin nombre</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Todos los archivos (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 no pudo ser abierto para su escritura.</translation>
+    </message>
+</context>
+<context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1749,21 +1763,18 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n caracteristica</numerusform>
-            <numerusform>%n caracteristicas</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Atributos</translation>
     </message>
@@ -1783,6 +1794,21 @@ p, li { white-space: pre-wrap; }
         <translation>Ocultar Todo</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
+        <source>Readonly All</source>
+        <translation>Todos Solo lectura</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
+        <source>Readonly None</source>
+        <translation>Ninguno Solo lectura</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="395"/>
         <source>Layers</source>
         <translation>Capas</translation>
@@ -1800,12 +1826,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
@@ -1813,78 +1834,68 @@ p, li { white-space: pre-wrap; }
         <translation>Trazas</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
-        <source>Readonly All</source>
-        <translation>Todos Solo lectura</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
-        <source>Readonly None</source>
-        <translation>Ninguno Solo lectura</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
-        <source>Close</source>
-        <translation>Cerrar</translation>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation>Sólo Lectura</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Bajo</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Opaco</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Opacidad</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulario</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1892,17 +1903,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation>He leído y acepto los términos de licencia</translation>
     </message>
 </context>
 <context>
@@ -1916,2792 +1927,2818 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Cargando complementos...</translation>
+        <translation>%1 v%2
+Cargando plugins...</translation>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
+        <translation>%1 v%2
 Iniciando...</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Borrar etiqueta «%1» en %2</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Crear área %1</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>Ay&uda</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Area: Crear camino %1</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Crear</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Area: Terminar Camino %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Carretera</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Area: Añadir nodo %1 a camino %2</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Editar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>Cerrar Área %1</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Ver</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Marcadores</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Añadir nodos a camino de doble via %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Establecer &proyección</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Crear carretera de doble vía %1</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Establecer &opacidad de Áreas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Crear nodo en carretera: %1</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Archivo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Exportar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Crear rotonda %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Abrir re&ciente</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Crear nodo %1 en carretera %2</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Importado recien&te</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Crear carretera: %1</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>H&erramientas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Crear nodo: %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>E&stilo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Añadir nodo %1 to camino %2</translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Nodo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Encontrados varios nodos en la misma posición.</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Ventana</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>¿Desea combinar todos los nodos en el punto de reunión?</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Puertos</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Combinar nodos en %1</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Carac&terística</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Capas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Eliminar característica %1</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&ación</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Mostrar flech&as de dirección</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>mosaico %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Barra de herramientas principal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Propiedades...</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Salir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Bajo</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&Acerca de</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Alto</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Abrir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Opaco</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Crear un documento nuevo e importar un archivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>Archivo</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Editar</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Zoom &todo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Zoom &ventana</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Hacer zoom a la ventana</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Capas</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>A&lejar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Crear</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Característica</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>A&cercar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Nodo</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Acercar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Dirección</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relación</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Enlace curvo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Herramientas</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Deshacer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Ayuda</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Rehacer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Contenido inválido en el portapapeles</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Mover</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Portapapeles no contiene datos validos</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Cambios no guardados</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>El mapa actual contiene cambios no guardados que serán perdidos al empezar uno nuevo.
-¿Deseas cancelar o quieres continuar y descartar los cambios?</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importar un fichero en el documento actual</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Descargar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Descargar datos de mapa para un área nueva</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Puntos de referencia</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Traza %1</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Enlace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Enorme advertencia de copyright</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Crear enlace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Estás intentando importar un archivo KML. Ten en cuenta que:
-
- - No puedes importar a OSM un archivo KML creado por Google Earth. Aunque creas
-   que los nodos que has creado desde GE son tuyos, ¡no lo son!
-   Todavía hay trabajo derivado por parte de GE, y por lo tanto, no puede ser usado en OSM.
-
- - Si lo has descargado desde internet, hay posibilidades de que tenga copyright.
-   Tienes que estar absolutamente seguro de que usar esos datos en OSM está permitido por el autor, o
-   que los datos son de dominio público
-
-Si no estás seguro, deberías preguntar en las listas "legal" o "talk" de correo de openstreetmap.
-
-¿Estás absolutamente seguro de que este KML puede ser importado legalmente en OSM?</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Archivo no válido</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Seleccionar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 no pudo ser abierto</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Cargar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Subir cambios al servidor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Detectada versión antigua de Qt</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Tu configuración usa Qt %1, el que contiene varios errores conocidos en subidas de datos a OpenStreetMap que conducen a códigos 401 en las respuestas de los servidores.</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>&Eliminar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Subir OSM</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Eliminar características seleccionadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Parece que no has especificado todavía tu
-nombre de usuario y contraseña OpenStreetMap
-¿Deseas hacerlo ahora?</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Error descargando</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Crear carretera nueva</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>El mapa no pudo ser descargado</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Error descargando OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Crear nuevo nodo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Revertir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Revertir direccion de ruta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Unir carreteras</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Ir a...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Dividir carreteras</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Romper Carreteras</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Doble via de transporte</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Crear vía de doble sentido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Tiempo de espera de red</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>No se puede contactar con OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Crear rotonda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Error al cerrar el bug</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Nuevo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>No se puede eliminar el bug. El mensaje del servidor es:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Crear un documento nuevo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Añadir números de calles</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Partir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Camino dividido en caminos separados (conectados)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Unir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Unir carreteras conectadas en una única carretera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Separar en dos partes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Romper</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Separar carreteras conectadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&lación</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Crear relación</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>Áre&a</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Crear área nueva</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Editar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Guardar &Como...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Cargar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>Ruta &curvada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Alinear nodos</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Preferencias...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Todo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Separar nodo %1</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Exportar todas las capas visibles a un archivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Añadir miembro a la relación</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Encontar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Eliminar miembro de la relación</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Encontrar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Encontrar y seleccionar elementos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Verpuerto...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Exportar las características en pantalla a un fichero</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Añadir...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Crear relación %1</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>Elimina&r...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Guardar estilo de mapa</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>Co&mbinar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Estilo de mapa Merkaartor (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Combinacion de Nodo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Cargar estilo de mapa</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Combinar los nodos seleccionados (el primero permanecerá seleccionado)</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Guardar</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Guardar a archivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Formatos soportados</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Descargar más</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Descargar más datos de mapa para el área catual</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Descargar la vista actual a la capa de descarga anterior</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Guardar documento Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>sin nombre</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Propiedades</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Archivos de documentos Merkaartor (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Ocultar/Mostrar la barra de Propiedades</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Todos los archivos (*)</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>Formato GPS Exchange (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Ocultar/Mostrar la barra de Capas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>Formato OpenStreetMap (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Información</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Formato Noni GPSPlot (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Ocultar/Mostrar la barra de Información</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>formato de registro NMEA GPS (*.nmea *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>Archivo KML (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Alinear</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Formato separado por comas (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Alinear nodos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Imágenes geoetiquetadas (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Alinear nodos seleccionados.Los dos primeros seleccionados dan la linea</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>Archivo de forma ESRI (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>&Propagación</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Documento Merkaartor (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Ruta</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Ocultar/Mostrar la barra de Acciones</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Cargar imagen</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Agregar posicion del nodo a la imágen</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Mostrar áreas &descargadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Copiar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Copiar las características seleccionadas y las etiquetas al portapapeles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Copiar las etiquetas de las características seleccionadas al portapapeles; si la característica es un señalizador, copiar también las coordenadas.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>No se puede abrir el archivo</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Pegar Etiquetas (&Reescribir)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 no pudo ser abierto para su escritura.</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Pegar (y sobreescribir) las etiquetas en el portapapeles a la funcion seleccionada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Archivo inválido</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Pegar Etiquetas (&Combinar)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 no es un documento de Merkaartor válido</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Pegar Etiquetas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Export arOSM</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Pegar etiquetas desde el portapapeles (Combinar con etiquetas existentes)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>Archivos OSM (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Combinar las marcas en el portapapeles con las de la característica seleccionada.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Exportar osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>Archivos osmChange (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Seleccionado...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Exportar GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Pegar caracteristica o caracteristicas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Archivos GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Pegar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exportar KML</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Pegar caracteristicas desde el portapapeles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Archivos KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Pegar las caracteristicas en el portapapeles; si las caracteristicas ya estan en el documento, reescribalas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binario)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (entero)</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>Carga &forzada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Añadir marcador</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Confirmar característica en la capa temporal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Especificar el nombre del marcador</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Confirmar la característica seleccionada desde una capa no-cargable (p. ej. Pista o Extracto) a la capa temporal, lista para cargar.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Nombre de marcador inválido</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>El marcador no puede estar en blanco.</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Aviso: El nombre del Marcador ya existe</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Activar/desactivar barra de herramientas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Introducir uno nuevo, mantener el mismo para sobreescribir o cancelar.</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Ocultar/Mostrar la Barra de Herramientas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Eliminar Marcador</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Ocultar Todo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Seleccionar el marcador a eliminar.</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>Error del GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Mostrar Todos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Incapaz de abrir el puerto GPS.</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>Capa de &imagen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Abrir archivo de registro NMEA</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Guardar plantillas de etiquetado</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Ver &nodos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Plantillas de etiquetas Merkaartor (*.mat)</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Plantillas de Etiqueta Abierta</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Mostrar no&mbres</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Iniciar</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>Ay&uda</translation>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Iniciar GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Crear</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Reproducir...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Carretera</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Reproducir GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Editar</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Ver</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Ocultar/Mostrar la barra GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Marcadores</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Establecer &proyección</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>D&etener</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Mostrar flech&as de dirección</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Detener GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Establecer &opacidad de Áreas</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centrar en GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Archivo</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Mostrar pistas &segmentos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Exportar</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Abrir re&ciente</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Mostrar e&scala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Importado recien&te</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>H&erramientas</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Mostrar &relaciones</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>E&stilo</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Nodo</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Mostrar las carreteras de fondo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Ventana</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Mostrar el límite de las carreteras</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Puertos</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Mostrar retoque</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Carac&terística</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Grabar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Grabar GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Capas</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Pausar GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&ación</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoImagen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Ocultar/Mostrar la barra de GeoImágenes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Salir</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&Acerca de</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Gestor de World OSB...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Abrir</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Editor de Atajos...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Crear un documento nuevo e importar un archivo</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>Co&mbinar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Guardar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Zoom &todo</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Añadir miembro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>Elimina&r miembro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Zoom &ventana</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Nunca</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Hacer zoom a la ventana</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>para &Pistas de un camino</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Siempre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>A&lejar</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Detalle</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Separar nodo de una carretera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>A&cercar</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Separar nodo de una carretera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Acercar</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Trabajar desconectado</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Enlace curvo</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>E&stilos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Deshacer</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Ocultar/Mostrar la barra de Estilos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Rehacer</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>Editor de servidores WMS...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>&Editor de servidores TMS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Mover</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Reiniciar estado de dialogos descartables</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Menu GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importar</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Cámara</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importar un fichero en el documento actual</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Crear &Salida</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Descargar</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Rotar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Descargar datos de mapa para un área nueva</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation>&Polígono</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Enlace</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Crear enlace</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation>Agregar nueva capa %Imágen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Atributos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Seleccionar</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Agregar &números de calle (Karlsruhe scheme)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Subdividir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Cargar</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation>Subdividir segmento de forma equitativa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Subir cambios al servidor</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Mostrar nodos &virtuales</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>&Eliminar</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Eliminar características seleccionadas</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>&Fijar zoom al mosaico del fondo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Borrar</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>Editor de &Proyecciones...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Crear carretera nueva</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>Mostrar Fotos en el ma&pa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Crear nuevo nodo</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Forzar Eliminación</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Revertir</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Revertir direccion de ruta</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>S&implificar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Ir a...</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Doble via de transporte</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>&Editor de Filtros...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Crear vía de doble sentido</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>&Ninguno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Crear rotonda</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Nuevo</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Crear un documento nuevo</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Partir</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>&Dividir área</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Camino dividido en caminos separados (conectados)</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Unir</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>&Terraza</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Unir carreteras conectadas en una única carretera</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Separar en dos partes</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation>Editor de barra de herramientas...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Romper</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Separar carreteras conectadas</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&lación</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>Im&primir...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Crear relación</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>Áre&a</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Propiedades...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Crear área nueva</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Editar...</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Guardar...</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation>Cor&tar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Cargar...</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>Ruta &curvada</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Preferencias...</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Todo</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Exportar todas las capas visibles a un archivo</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Encontar...</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Encontrar</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>Escalar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Encontrar y seleccionar elementos</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Verpuerto...</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Exportar las características en pantalla a un fichero</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Añadir...</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>Elimina&r...</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>Co&mbinar</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Combinacion de Nodo</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Combinar los nodos seleccionados (el primero permanecerá seleccionado)</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Guardar &Como...</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Guardar</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Descargar hijos perdidos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Guardar a archivo</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Descargar más</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Borrar etiqueta «%1» en %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Descargar más datos de mapa para el área catual</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Descargar la vista actual a la capa de descarga anterior</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Eliminar miembro '%1' en %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Propiedades</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Ocultar/Mostrar la barra de Propiedades</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Relacion Modificada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Crear nodo de interaccion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Ocultar/Mostrar la barra de Capas</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Crear nodo en carretera: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Crear Area de Interaccion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Información</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Crear área %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Ocultar/Mostrar la barra de Información</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Area: Crear camino %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Añadir un agujero.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Alinear</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>¿Desea añadir un agujero (u otro) a este área?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Alinear nodos</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Area: Terminar Camino %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Alinear nodos seleccionados.Los dos primeros seleccionados dan la linea</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Area: Añadir nodo %1 a camino %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Cerrar Área %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>&Propagación</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Añadir nodos a camino de doble via %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Crear carretera de doble vía %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Ocultar/Mostrar la barra de Acciones</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>CLICK IZQUIERDO para inciar;ARRASTRAR para escalar;SHIFT+ARRASTRE para rotar;CLICK IZQUIERDO para terminar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Mostrar áreas &descargadas</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Crear Poligono de Interaccion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Crear polígono %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Copiar</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Crear interaccion en rotonda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Copiar las características seleccionadas y las etiquetas al portapapeles</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Crear rotonda %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Copiar las etiquetas de las características seleccionadas al portapapeles; si la característica es un señalizador, copiar también las coordenadas.</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Crear via de interaccion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Crear nodo %1 en carretera %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Pegar Etiquetas (&Reescribir)</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Crear carretera: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Pegar (y sobreescribir) las etiquetas en el portapapeles a la funcion seleccionada</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Crear nodo: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Añadir nodo %1 to camino %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Pegar Etiquetas (&Combinar)</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Pegar Etiquetas</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Pegar etiquetas desde el portapapeles (Combinar con etiquetas existentes)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Combinar las marcas en el portapapeles con las de la característica seleccionada.</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Editar Interaccion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Eliminar característica %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Seleccionado...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Eliminar Infantes.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>CLICK IZQUIERDO para seleccionar;ARRASTRE IZQUIERDO para mover</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Mover nodo de interaccion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Mover nodos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Mover nodo %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>Im&primir...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Encontrados varios nodos en la misma posición.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>¿Desea combinar todos los nodos en el punto de reunión?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Combinar nodos en %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Rotar interaccion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>Click-izquierdo a la primera esquina -> Arrastre-izquierdo al area especifica ->Click izquierdo para ampliar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Zoom interactivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>Formato GPS Exchange (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>Formato OpenStreetMap (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Descargar hijos perdidos</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Formato Noni GPSPlot (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation>Cor&tar</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>formato de registro NMEA GPS (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>Archivo KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Formato separado por comas (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Imágenes geoetiquetadas (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation>Alt+X</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>Archivo de forma ESRI (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>Escalar</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Formatos soportados</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Documento Merkaartor (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Pegar</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Pegar caracteristicas desde el portapapeles</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>mosaico %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Pegar las caracteristicas en el portapapeles; si las caracteristicas ya estan en el documento, reescribalas</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>No se puede cargar archivo proyecciones</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projections.xml" no se puede abrir en cualquier lugar. Abortando.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Bajo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binario)</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Confirmar característica en la capa temporal</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Opaco</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Confirmar la característica seleccionada desde una capa no-cargable (p. ej. Pista o Extracto) a la capa temporal, lista para cargar.</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Característica</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Nodo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Ruta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Activar/desactivar barra de herramientas</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relación</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Ocultar/Mostrar la Barra de Herramientas</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Cargar imagen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Ocultar Todo</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Agregar posicion del nodo a la imágen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Mostrar Todos</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>Capa de &imagen</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>Editor de servidores WMS...</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>&Editor de servidores TMS</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Vista</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Subdividir</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation>Subdividir segmento de forma equitativa</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>S&implificar</translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Capas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Crear</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>&Editor de Filtros...</translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Herramientas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>&Ninguno</translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation>Ventanas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Contenido inválido en el portapapeles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>&Dividir área</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Portapapeles no contiene datos validos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation>Importar archivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>&Terraza</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Cambios no guardados</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>El mapa actual contiene cambios no guardados que serán perdidos al empezar uno nuevo.
+¿Deseas cancelar o quieres continuar y descartar los cambios?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation>Editor de barra de herramientas...</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Puntos de referencia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Traza %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>Barra de herramientas principal</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Enorme advertencia de copyright</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Estás intentando importar un archivo KML. Ten en cuenta que:
+
+ - No puedes importar a OSM un archivo KML creado por Google Earth. Aunque creas
+   que los nodos que has creado desde GE son tuyos, ¡no lo son!
+   Todavía hay trabajo derivado por parte de GE, y por lo tanto, no puede ser usado en OSM.
+
+ - Si lo has descargado desde internet, hay posibilidades de que tenga copyright.
+   Tienes que estar absolutamente seguro de que usar esos datos en OSM está permitido por el autor, o
+   que los datos son de dominio público
+
+Si no estás seguro, deberías preguntar en las listas "legal" o "talk" de correo de openstreetmap.
+
+¿Estás absolutamente seguro de que este KML puede ser importado legalmente en OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Archivo no válido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Iniciar</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 no pudo ser abierto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Iniciar GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Reproducir...</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Reproducir GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Ocultar/Mostrar la barra GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Archivos abiertos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Detectada versión antigua de Qt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>D&etener</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Tu configuración usa Qt %1, el que contiene varios errores conocidos en subidas de datos a OpenStreetMap que conducen a códigos 401 en las respuestas de los servidores.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Detener GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Subir OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centrar en GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Parece que no has especificado todavía tu
+nombre de usuario y contraseña OpenStreetMap
+¿Deseas hacerlo ahora?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Mostrar pistas &segmentos</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Error descargando</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>El mapa no pudo ser descargado</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Mostrar e&scala</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Error descargando OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Mostrar &relaciones</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Mostrar las carreteras de fondo</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Crear polígono</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Mostrar el límite de las carreteras</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Especificar el numero de lados</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Mostrar retoque</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Unir carreteras</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Grabar</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Dividir carreteras</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Grabar GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Romper Carreteras</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pausar</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Pausar GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Forzar descarga de características</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eoImagen</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Tiempo de espera de red</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Ocultar/Mostrar la barra de GeoImágenes</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>No se puede contactar con OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Error al cerrar el bug</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Gestor de World OSB...</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>No se puede eliminar el bug. El mensaje del servidor es:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Editor de Atajos...</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Crear Salida</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>Co&mbinar...</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Intersección múltiple</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Añadir miembro</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Las vías tienen múltiples intersecciones.
+¿Todavía desea crear una unión para cada uno (los cruces no deseados puede ser suprimidos después)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>Elimina&r miembro</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Añadir números de calles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nunca</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>para &Pistas de un camino</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Siempre</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Detalle</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Separar nodo de una carretera</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Separar nodo de una carretera</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>triangular</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Trabajar desconectado</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>rectangular</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>pentagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>E&stilos</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>hexagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Ocultar/Mostrar la barra de Estilos</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>heptagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Agregar &números de calle (Karlsruhe scheme)</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>octagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>&Fijar zoom al mosaico del fondo</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>Editor de &Proyecciones...</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>Mostrar Fotos en el ma&pa</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Forzar Eliminación</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Cerrar</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Alinear nodos</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Relacion Modificada %1</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Eliminar miembro '%1' en %2</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Separar nodo %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>Conflictos no resueltos</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Añadir miembro a la relación</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Resuelva primero los conflictos existentes</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Eliminar miembro de la relación</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Se recomienda encarecidamente guardar los cambios en el documento tras una carga.
-¿Desea hacerlo ahora?</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Establecer etiquetas en %1</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Unir areas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Añadir un agujero.</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Separar areas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>¿Desea añadir un agujero (u otro) a este área?</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>No se puede cargar archivo proyecciones</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Crear relación %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>"Projections.xml" no se puede abrir en cualquier lugar. Abortando.</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Guardar estilo de mapa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Archivos abiertos</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Estilo de mapa Merkaartor (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Crear Salida</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Cargar estilo de mapa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Poyeccion invalida</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>No se puede estabecler proyección "%1"</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation>Rehacer Historial</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Reiniciar estado de dialogos descartables</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Menu GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>sin nombre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Cámara</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Guardar documento Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Crear &Salida</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Archivos de documentos Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Eliminar Infantes.</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Establecer etiquetas en multiples funciones</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>No se puede abrir el archivo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Crear Area de Interaccion</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 no pudo ser abierto para su escritura.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Crear nodo de interaccion</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>CLICK IZQUIERDO para inciar;ARRASTRAR para escalar;SHIFT+ARRASTRE para rotar;CLICK IZQUIERDO para terminar</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Archivo inválido</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Crear Poligono de Interaccion</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 no es un documento de Merkaartor válido</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Crear polígono %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Export arOSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Crear interaccion en rotonda</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>Archivos OSM (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Crear via de interaccion</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Exportar osmChange</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Editar Interaccion</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>Archivos osmChange (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Mover nodos</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Exportar GPX</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Mover nodo %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Archivos GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>CLICK IZQUIERDO para seleccionar;ARRASTRE IZQUIERDO para mover</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Exportar KML</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Mover nodo de interaccion</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Archivos KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Rotar interaccion</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>Click-izquierdo a la primera esquina -> Arrastre-izquierdo al area especifica ->Click izquierdo para ampliar</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (entero)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Zoom interactivo</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Añadir marcador</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Crear polígono</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Especificar el nombre del marcador</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Especificar el numero de lados</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Nombre de marcador inválido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Forzar descarga de características</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>El marcador no puede estar en blanco.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>Carga &forzada</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Aviso: El nombre del Marcador ya existe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Introducir uno nuevo, mantener el mismo para sobreescribir o cancelar.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Mostrar no&mbres</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Eliminar Marcador</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Rotar</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Seleccionar el marcador a eliminar.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Poyeccion invalida</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Intersección múltiple</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>No se puede estabecler proyección "%1"</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Las vías tienen múltiples intersecciones.
-¿Todavía desea crear una unión para cada uno (los cruces no deseados puede ser suprimidos después)?</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>Error del GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Pegar caracteristica o caracteristicas</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Incapaz de abrir el puerto GPS.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Atributos</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Abrir archivo de registro NMEA</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Mostrar nodos &virtuales</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Guardar plantillas de etiquetado</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Plantillas de etiquetas Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Plantillas de Etiqueta Abierta</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Conflictos no resueltos</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Resuelva primero los conflictos existentes</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Se recomienda encarecidamente guardar los cambios en el documento tras una carga.
+¿Desea hacerlo ahora?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Establecer etiquetas en multiples funciones</translation>
+    </message>
+    <message>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Establecer etiquetas en %1</translation>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>Ultimo: </i><b>%1</b&gt; by <b>%2</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation><i>Ultimo: </i><b>%1</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
         <translation><br/><i>layer: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Punta de referencia</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>coordenada</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>descripción</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>comentario</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Nodo</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>elevación</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>velocidad</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>tamaño</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>miembros</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>Arriba a la izquierda</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>Botright</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Relación</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Rol</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Miembro</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Longitud</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>nodos %1</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>Área</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>coordenada</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>elevación</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>velocidad</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Punta de referencia</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Dirección</translation>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>descripción</translation>
+        <location filename="../src/common/MapView.cpp" line="339"/>
+        <source>%1 m/pixel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>comentario</translation>
+        <location filename="../src/common/MapView.cpp" line="345"/>
+        <source>Align: %1m @ %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Nodo</translation>
+        <location filename="../src/common/MapView.cpp" line="351"/>
+        <source>%1ms</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="384"/>
         <source>%1 m</source>
@@ -4713,32 +4750,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="339"/>
-        <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="345"/>
-        <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="351"/>
-        <source>%1ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
         <translation>Recuadro delimitador</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Proyección</translation>
     </message>
@@ -4746,34 +4768,44 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Nuevo Servidor</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Nuevo marcador</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Preferencias de carga</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Duplicar clave</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Más de 150 preferencias</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Nuevo marcador</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Nuevo Servidor</translation>
     </message>
 </context>
 <context>
@@ -4802,17 +4834,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Clase</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Campo desconocido.</translation>
     </message>
@@ -4825,25 +4857,10 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>¡Error!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Nombre del servicio del buscador no encontrado</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Nombre del servicio de busqueda administrador niega conexion</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Nombre del servicio de busqueda necesita autentifcacion</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Error desconocido.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4864,11 +4881,6 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4876,6 +4888,11 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4897,7 +4914,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
@@ -4917,12 +4934,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
@@ -4932,12 +4949,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
@@ -4947,12 +4964,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4981,31 +4998,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Siempre</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Seleccionar color</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Editor de estilo de mapa</translation>
@@ -5038,6 +5036,31 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Espesor proporcional</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>Grosor fijo</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
         <translation>Filtro</translation>
@@ -5083,32 +5106,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="775"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1347"/>
         <source>Draw with color</source>
-        <translation>Dibujar con color</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Espesor proporcional</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>Grosor fijo</translation>
+        <translation>Dibujar con color</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
@@ -5130,7 +5128,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5140,12 +5138,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5165,7 +5163,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5202,13 +5200,32 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <source>Label with background tag</source>
         <translation>Etiqueta con marca de fondo</translation>
     </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Siempre</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Seleccionar color</translation>
+    </message>
 </context>
 <context>
     <name>PhotoLoadErrorDialog</name>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
         <source>No Valid geotag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
@@ -5219,17 +5236,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
         <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
         <source>Load without associated node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
@@ -5250,6 +5267,11 @@ What do you want to do next?</source>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5257,17 +5279,17 @@ What do you want to do next?</source>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>Archivos SVG (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>untitled</source>
         <translation>sin nombre</translation>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>Archivos SVG (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
         <translation>Todos los archivos (*)</translation>
@@ -5277,180 +5299,15 @@ What do you want to do next?</source>
         <source>Image files (*.png *.jpg)</source>
         <translation>Archivos de imagen (*.png *.jpg)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>Inglés</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Árabe</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Checo</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>Alemán</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>Francés</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation>Húngaro</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Italiano</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation>Japonés</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation>Polaco</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Portugués (Brasil)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Ruso</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Directorio de estilos personalizados</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Plantilla de etiqueta</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartor plantilla de etiqueta (*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Seleccionar color</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>La herramienta ya existe</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Ya existe una herramienta con este nombre.
-Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere modificar el existente</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>No se puede eliminar una herramienta preconfigurada</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>No se puede eliminar la herramienta preestablecida «%1»</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>No se puede modificar el nombre de una herramienta preconfigurada</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>No se puede modificar el nombre de la herramienta preconfigurada «%1»</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Seleccionar herramienta ejecutable</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Seleccionar el directorio de registros</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Sitio</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Puede que necesite reiniciar el programa para que estos cambios tengan efecto</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Utilizar idioma</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Traducir las etiquetas estándar</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
         <source>Visual</source>
         <translation>Visual</translation>
@@ -5471,11 +5328,6 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Opacidad baja/alta</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Modo separar mover</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
         <translation>Interacción con un solo botón del ratón</translation>
@@ -5486,6 +5338,26 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Utilizar estylo Qt personalizado</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Modo separar mover</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Usar nodos Virtuales (requiere reiniciar)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>relaciones seleccionables mientras esta oculto</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
         <source>Colors</source>
         <translation>Colores</translation>
@@ -5517,9 +5389,9 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Sobreescribir stilo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Resaltado</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>pista GPX</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5532,74 +5404,64 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Píxeles</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Enfocar</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Relaciones</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Estilo de mapa</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Usar apariencia simple de pista GPX</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Estilo Actual</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Interface</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Desactivar estilos para las capas de rutas</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Resaltado</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Plantilla</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Relaciones</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Predefinidos</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Enfocar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Personalizado</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Resaltar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Datos</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation>Sucio</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Contraseña:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Sitio</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Documentos</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Puede que necesite reiniciar el programa para que estos cambios tengan efecto</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Utilizar idioma</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation>Sucio</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Traducir las etiquetas estándar</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
@@ -5609,52 +5471,99 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Estilo de mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Directorio de estilos personalizados</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Estilo Actual</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Desactivar estilos para las capas de rutas</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Plantilla</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Plantilla de etiqueta</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Predefinidos</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Personalizado</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Datos</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
@@ -5665,7 +5574,17 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Documentos</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation>Documento de plantilla cargado automáticamente</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
@@ -5695,12 +5614,12 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5708,6 +5627,32 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>GPS</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>Entrada GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Serie</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Puerto</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Alojamiento (servidor)</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
         <translation>Guardar registro NMEA</translation>
@@ -5733,9 +5678,14 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Utilizar Proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Host:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Contraseña:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Usuario:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
@@ -5743,14 +5693,14 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Puerto:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation>Documento de plantilla cargado automáticamente</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Host:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
@@ -5785,7 +5735,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
@@ -5818,95 +5768,156 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Usuario:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>Inglés</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Resaltar</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Árabe</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>pista GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Usar apariencia simple de pista GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Checo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>Entrada GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Holandés</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>Alemán</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Serie</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>Francés</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Puerto</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation>Húngaro</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Alojamiento (servidor)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Usar nodos Virtuales (requiere reiniciar)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation>Japonés</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Holandés</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation>Polaco</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Portugues</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>Portugués (Brasil)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Ruso</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Esloveno</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Español</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Sueco</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>Ucraniano</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartor plantilla de etiqueta (*.mat)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Seleccionar color</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>La herramienta ya existe</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Ya existe una herramienta con este nombre.
+Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere modificar el existente</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>No se puede eliminar una herramienta preconfigurada</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Portugues</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>No se puede eliminar la herramienta preestablecida «%1»</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Esloveno</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>No se puede modificar el nombre de una herramienta preconfigurada</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Español</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>No se puede modificar el nombre de la herramienta preconfigurada «%1»</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Sueco</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Seleccionar herramienta ejecutable</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>Ucraniano</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>relaciones seleccionables mientras esta oculto</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Interface</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Seleccionar el directorio de registros</translation>
     </message>
 </context>
 <context>
@@ -5914,7 +5925,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="14"/>
         <source>Projections setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="20"/>
@@ -5924,7 +5935,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="47"/>
         <source>Projection list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="76"/>
@@ -5934,7 +5945,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="93"/>
         <source>PROJ4 string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
@@ -5959,7 +5970,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5985,35 +5996,35 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6047,6 +6058,11 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Propiedades - elementos multiples</translation>
     </message>
     <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Propiedades - Nodo</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
         <translation>Propiedades - Camino</translation>
@@ -6065,7 +6081,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
@@ -6082,38 +6098,10 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <source>Select member</source>
         <translation>Seleccionar miembro</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Propiedades - Nodo</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Limpieza en cascada</translation>
@@ -6139,7 +6127,30 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Mover nodo %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation>Importando...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation>Importado: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Import osmChange</translation>
     </message>
@@ -6149,31 +6160,31 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Importar NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importar NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation>Datos inválidos</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6189,14 +6200,14 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6226,7 +6237,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6237,12 +6248,12 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Error de registro GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Incapaz de crear archivo de registro GPS: %1.</translation>
     </message>
@@ -6250,17 +6261,17 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Error de registro GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Incapaz de crear archivo de registro GPS: %1.</translation>
     </message>
@@ -6346,92 +6357,136 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< S E P A R A D O R ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Personalizar Barra de Herramientas</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de Herramientas</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation>Restaurar todo</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Arriba</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation>Abajo</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< S E P A R A D O R ></translation>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6449,7 +6504,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
@@ -6467,17 +6522,17 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6505,17 +6560,17 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6559,6 +6614,11 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <translation>Nombre</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Identificador</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
         <translation>Consulta</translation>
@@ -6566,12 +6626,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Identificador</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6585,12 +6640,12 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
@@ -6614,6 +6669,16 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>Subir a Openstreetmap</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation>Por favor,especifique un comentario para cambio de opciones</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>Revise minuciosamente los cambios enviados a OSM</translation>
@@ -6628,16 +6693,6 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Subir a Openstreetmap</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Por favor,especifique un comentario para cambio de opciones</translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
@@ -6681,7 +6736,7 @@ Por favor elija otro nombre o haga clic en el boton <Aplicar> si quiere mo
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6695,44 +6750,44 @@ p, li { white-space: pre-wrap; }
         <translation>Proyección:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Lat/Lon (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Lat/Lon (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
@@ -6750,24 +6805,18 @@ p, li { white-space: pre-wrap; }
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: Obtener Servicios</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Dirección y ruta no pueden estar vacíos.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Descarga fallida: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Error al leer servicios.
@@ -6802,7 +6851,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
@@ -6812,7 +6861,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6822,12 +6871,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6851,12 +6900,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
@@ -6901,61 +6950,61 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Extraer - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation># de los segmentos de la pista</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Distancia total</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Duración total</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Extraer - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Extraer capa de dibujo</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
@@ -6995,17 +7044,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7054,12 +7103,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
@@ -7067,35 +7116,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: Tener Capacidades</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Dirección y ruta no pueden estar vacíos.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Descarga fallida: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Error al leer las capacidades
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>Configurar servidores WMS</translation>
@@ -7116,31 +7136,26 @@ p, li { white-space: pre-wrap; }
         <translation>Nombre:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>URL del servidor:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>Capas:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>Proyección:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>Formato de imagen:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Estilos:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation>Copy text   \t
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
@@ -7150,9 +7165,14 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>Proyección:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
@@ -7160,14 +7180,24 @@ p, li { white-space: pre-wrap; }
         <translation>Niveles de Zoom</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation>Formato de imagen:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Estilos:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7185,14 +7215,33 @@ p, li { white-space: pre-wrap; }
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>URL del servidor:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: Tener Capacidades</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Dirección y ruta no pueden estar vacíos.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Error al leer las capacidades
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Descarga fallida: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation>Sin nombre</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_et.ts b/translations/merkaartor_et.ts
index 2ea3e6f..e1279a1 100644
--- a/translations/merkaartor_et.ts
+++ b/translations/merkaartor_et.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="et">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,156 +24,186 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished"></translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Muudatuste logi</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Import</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Eksport</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Vaikimisi</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Katkesta</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 ei saa avada.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Kõik failid (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 ei saa kirjutamiseks avada.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
         <source>No description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -183,17 +211,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="25"/>
         <source>Driving at the right side of the road</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="40"/>
         <source>Distance between two roads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -201,12 +229,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="25"/>
         <source>Driving at the right side of the road</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -214,35 +242,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="195"/>
         <source>Center map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="196"/>
         <source>Center && Zoom map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -250,16 +275,16 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="14"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="37"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -270,9 +295,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -281,95 +306,95 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="326"/>
         <location filename="../src/Sync/DirtyList.cpp" line="570"/>
         <source>ADD road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="334"/>
         <location filename="../src/Sync/DirtyList.cpp" line="604"/>
         <source>ADD trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="342"/>
         <location filename="../src/Sync/DirtyList.cpp" line="537"/>
         <source>ADD relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="350"/>
         <location filename="../src/Sync/DirtyList.cpp" line="701"/>
         <source>UPDATE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="358"/>
         <location filename="../src/Sync/DirtyList.cpp" line="639"/>
         <source>UPDATE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="366"/>
         <location filename="../src/Sync/DirtyList.cpp" line="670"/>
         <source>UPDATE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="374"/>
         <location filename="../src/Sync/DirtyList.cpp" line="734"/>
         <source>REMOVE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="382"/>
         <location filename="../src/Sync/DirtyList.cpp" line="761"/>
         <source>REMOVE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="390"/>
         <location filename="../src/Sync/DirtyList.cpp" line="788"/>
         <source>REMOVE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="423"/>
         <location filename="../src/Sync/DirtyList.cpp" line="430"/>
         <location filename="../src/Sync/DirtyList.cpp" line="446"/>
         <source>Error uploading request</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="424"/>
         <source>Please check your username and password in the Preferences menu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="427"/>
         <location filename="../src/Sync/DirtyList.cpp" line="447"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
         <source>
 API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="464"/>
         <source>Uploading changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="490"/>
         <source>OPEN changeset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="517"/>
         <source>CLOSE changeset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -379,187 +404,187 @@ API message is '%1'</source>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="71"/>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="85"/>
         <source>Error uploading request</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="65"/>
         <source>Please check your username and password in the Preferences menu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="68"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="70"/>
         <source>
 API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="86"/>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
         <source>Checking changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="184"/>
         <source>OPEN changeset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="301"/>
         <source>CLOSE changeset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="354"/>
         <source>ADD relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="368"/>
         <source>ADD road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="383"/>
         <source>ADD trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="399"/>
         <source>UPDATE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="414"/>
         <source>UPDATE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="428"/>
         <source>UPDATE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="442"/>
         <source>REMOVE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="456"/>
         <source>REMOVE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="470"/>
         <source>REMOVE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -567,12 +592,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="14"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="32"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="40"/>
@@ -582,272 +607,261 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="62"/>
         <source>Current view</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
         <source>From the map below (map provided by the OpenStreetMap project)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="112"/>
         <source>Also download raw GPS tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="119"/>
         <source>Resolve all relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
         <source>%1 download</source>
         <translation>%1 allalaadimine</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
         <source>Downloading unresolved...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
         <source>Downloading unresolved %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
         <source>Parsing unresolved %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
         <source>Parsing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
         <source>Empty roads/relations detected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
         <source>Empty roads/relations are probably errors.
 Do you want to mark them for deletion?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
         <source>Remove empty feature %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
         <source>Uploading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
         <source>Preparing changes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
         <source>Waiting for server response</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
         <source>error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
         <source>Downloading from OSM (connecting)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
         <source>Username/password invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Unresolved conflicts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Please resolve existing conflicts first</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
         <source>Downloading trackpoints %1-%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
         <source>Downloaded track - nodes %1-%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
         <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
         <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -855,27 +869,27 @@ Delete what can be?</source>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="13"/>
         <source>Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="25"/>
         <source>What do you want to export?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="38"/>
         <source>All visible (i.e. not hidden)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="45"/>
         <source>Viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="52"/>
         <source>Selected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -883,47 +897,47 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="430"/>
         <source>Features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="431"/>
         <source>Center map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="432"/>
         <source>Center && Zoom map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="433"/>
         <source>Download missing children</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
         <source>Add to selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="442"/>
         <source>Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="443"/>
         <source>Roads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="444"/>
         <source>POI's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="445"/>
@@ -936,22 +950,22 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="14"/>
         <source>Features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="72"/>
         <source>Only features fully within the viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -959,17 +973,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="20"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="30"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
@@ -980,9 +994,9 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -990,27 +1004,27 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="47"/>
         <source>Filter list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="76"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="93"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
@@ -1030,275 +1044,249 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="141"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
         <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
         <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
         <source>Please specify Walking Papers URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
         <source>Center map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
         <source>Save geotagged image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
         <source>Photo layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints found for image "%1"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="28"/>
@@ -1308,286 +1296,214 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
         <source>lonMin, latMin, lonMax, latMax</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="134"/>
         <source>latCent, lonCent, latSpan, lonSpan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="156"/>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="176"/>
         <source>OSM API Url</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="203"/>
         <source>OSM XAPI url</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="225"/>
         <location filename="../src/common/GotoDialog.ui" line="244"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 ei saa avada.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 ei ole CSV impordi sätete fail</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 ei saa kirjutamiseks avada.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
         <source>Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1595,135 +1511,233 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
         <source>Specifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
         <source>First line contains headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
         <source>Delimiter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
         <source>Colon (,)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="131"/>
         <source>Semicolon (;)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="138"/>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="145"/>
         <source>Other:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
         <source>Projection (in PROJ4 format; leave blank for latitude/longitude)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="227"/>
         <source>Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="254"/>
         <source>Field list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
         <source>Field Type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="310"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="336"/>
         <source>Import range</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="342"/>
         <source>From (0 from start):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="352"/>
         <source>To (0 to End):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="367"/>
         <source>Load settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="374"/>
         <source>Save settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 ei saa avada.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 ei ole CSV impordi sätete fail</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Kõik failid (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 ei saa kirjutamiseks avada.</translation>
     </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1732,28 +1746,25 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Docks/InfoDock.cpp" line="24"/>
         <location filename="../src/Docks/InfoDock.cpp" line="96"/>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Layer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n tunnus</numerusform>
-            <numerusform>%n tunnust</numerusform>
-        </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1762,33 +1773,33 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
         <source>Show All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="248"/>
         <location filename="../src/Docks/LayerDock.cpp" line="356"/>
         <source>Hide All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="255"/>
         <source>Readonly All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="260"/>
         <source>Readonly None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="267"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="395"/>
         <source>Layers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="401"/>
@@ -1798,81 +1809,81 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
         <source>Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1880,17 +1891,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1898,2808 +1909,2819 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Utils/MDiscardableDialog.cpp" line="24"/>
         <source>Don't ask me this again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Abi</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Loo</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Redigeerimine</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Vaade</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Järjehoidjad</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Fail</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Eksport</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Stiil</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Aken</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Välju</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&Info</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Ava</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Võta tagasi</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Tee uuesti</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Liiguta</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Import</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>Allalaa&dimine</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Vali</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Lae üles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Mine...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Uus</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Liitu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Jaga kaheks</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 ei saa avada.</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Ala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Redigeeri...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Lae...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Eelistused...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Kõik...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Otsi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>Lis&a...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Eemalda...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Liida</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Salvesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Lisa tänava number</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Omadused</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Info</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Joonda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Sõlmede joondamine</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Kopeeri</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Katkesta</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Käivita</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 ei saa kirjutamiseks avada.</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 pole õige Merkaartori dokument.</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Lisa järjehoidja</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Ühenda...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Salvesta...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Lisa liige</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Eemalda liige</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Mitte kunagi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Alati</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Haagi lahti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Abi</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Loo</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Töötamine võrguta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Redigeerimine</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Stiilid</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Vaade</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Järjehoidjad</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Fail</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Eksport</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Kaamera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Stiil</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Aken</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Välju</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&Info</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Ava</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>&Puudub</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Võta tagasi</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Tee uuesti</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Liiguta</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Import</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>Allalaa&dimine</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Vali</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Lae üles</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Mine...</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Uus</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Liitu</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Jaga kaheks</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Ala</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Redigeeri...</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Salvesta...</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Lae...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Eelistused...</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Kõik...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Otsi...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>Lis&a...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Eemalda...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Liida</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Salvesta</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Omadused</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Info</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Joonda</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Sõlmede joondamine</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopeeri</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Kõik failid (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Katkesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Käivita</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 ei saa avada.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Ühenda...</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Lisa liige</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Eemalda liige</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Mitte kunagi</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Alati</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Haagi lahti</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Lisa tänava number</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Töötamine võrguta</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Stiilid</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Kaamera</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 ei saa kirjutamiseks avada.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 pole õige Merkaartori dokument.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>&Puudub</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Lisa järjehoidja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Unresolved conflicts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Please resolve existing conflicts first</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
         <source>It is strongly recommended to save the changes to your document after an upload.
 Do you want to do this now?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="131"/>
         <location filename="../src/common/TagModel.cpp" line="162"/>
         <source>Set Tags on multiple features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="133"/>
         <location filename="../src/common/TagModel.cpp" line="164"/>
         <source>Set Tags on %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
         <source>Waypoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
         <source>coord</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>%1 punkti</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>Ala</translation>
     </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MapView</name>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4708,23 +4730,33 @@ Do you want to do this now?</source>
         <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
         <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
         <source>New Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
@@ -4732,7 +4764,7 @@ Do you want to do this now?</source>
         <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
         <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
         <source>New Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4740,12 +4772,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="33"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="53"/>
@@ -4755,25 +4787,25 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="73"/>
         <source>Selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4781,27 +4813,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/NameFinder/namefinderwidget.cpp" line="91"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4809,7 +4826,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/NameFinder/namefinderwidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4819,19 +4836,19 @@ Do you want to do this now?</source>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>Output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
@@ -4843,12 +4860,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <source>Image files (*.png *.jpg)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>SVG files (*.svg)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4856,62 +4873,62 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
         <source>min lat/Lon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="90"/>
         <source>max lat/Lon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
         <source>Show Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4919,12 +4936,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="25"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="35"/>
@@ -4935,44 +4952,25 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="74"/>
         <source>User:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Alati</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
         <source>Global</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
@@ -4997,9 +4995,34 @@ Do you want to do this now?</source>
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
@@ -5009,142 +5032,117 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
         <source>Duplicate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
         <source>Tag selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
         <source>meter/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
         <source>Visible up to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
         <source>Visible from scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="775"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1347"/>
         <source>Draw with color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
         <source>off</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
         <source>Fill area</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
         <source>Boundary</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
         <source>Touchup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="981"/>
         <source>Draw steps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
         <source>Draw icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
         <source>Label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1370"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1417"/>
         <source>Label tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
         <source>Halo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
@@ -5154,12 +5152,31 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
         <source>Label with background tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Alati</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5167,311 +5184,142 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
         <source>No Valid geotag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
         <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
         <source>Load without associated node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
         <source>Extract info from barcode (Walking Papers)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
         <source>Ignore it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
         <source>Do this for all current photos.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PictureViewerDialog</name>
     <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>untitled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Araabia</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Portugali (Brasiilia)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>untitled</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>Kõik failid (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
         <source>Visual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
         <source>Zoom Out/in (%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
         <source>Opacity low/high</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
         <source>Use custom Qt style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
         <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
         <source>Separate Move mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
         <source>Use Virtual nodes (new session required)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
         <source>Relations selectable while hidden</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
         <source>Colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
@@ -5497,12 +5345,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
         <source>Overwrite style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
         <source>GPX track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5512,132 +5360,144 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
         <source>Pixels</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
         <source>Use simple GPX track appearance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
         <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
         <source>Hover</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
         <source>Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
         <source>Focus</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
         <source>Highlight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
         <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
         <source>Locale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
         <source>You may need to restart the program for these changes to take effect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
         <source>Use language</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
         <source>Translate standard tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
         <source>Map style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
         <source>Current style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
         <source>Disable styles for track layers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
         <source>Template</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
@@ -5647,164 +5507,164 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
         <source>Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
         <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
         <source>Autosave documents after upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
         <source>Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
         <source>Automatically extract tracks on open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
         <source>Track layers readonly by default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
         <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
         <source>GPS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
         <source>GPS input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
         <source>gpsd</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
         <source>Serial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
         <source>Host</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
         <source>Set system time to GPS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
         <source>Network</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
         <source>Proxy settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
         <source>Use Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
         <source>User:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
         <source>Host:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
         <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
@@ -5814,42 +5674,42 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
         <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
         <source>Cache directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
         <source>Cache size (in Mb; 0 to disable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
         <source>Map Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
         <source>Tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
         <source>Path:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
@@ -5864,7 +5724,158 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Araabia</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>Portugali (Brasiilia)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5872,27 +5883,27 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="14"/>
         <source>Projections setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="20"/>
         <source>Projections</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="47"/>
         <source>Projection list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="76"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="93"/>
         <source>PROJ4 string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
@@ -5912,12 +5923,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="141"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5925,7 +5936,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5933,45 +5944,45 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="20"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5979,7 +5990,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/common/PropertiesDialog.ui" line="14"/>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5997,141 +6008,141 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
         <source>Selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
         <source>Properties - Multiple elements</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
         <source>Properties - Node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
         <source>Properties - Relation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
         <source>Center map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
         <source>Center && Zoom map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
         <source>Select member</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Katkesta</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="66"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="74"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="188"/>
         <source>Set Tag '%1=%2' on %3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="314"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="400"/>
         <source>Clear Tag '%1' on %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/NodeCommands.cpp" line="17"/>
         <location filename="../src/Commands/NodeCommands.cpp" line="25"/>
         <location filename="../src/Commands/NodeCommands.cpp" line="111"/>
         <source>Move node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Katkesta</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportNGT.cpp" line="21"/>
         <source>Import NGT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6140,36 +6151,36 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/GPS/qgps.cpp" line="91"/>
         <location filename="../src/GPS/qgps.cpp" line="150"/>
         <source>Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="93"/>
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
         <source>Meters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="140"/>
         <source>km/h</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="147"/>
         <source>Unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="153"/>
@@ -6184,43 +6195,43 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
         <source>GPS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6228,13 +6239,13 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="14"/>
         <source>GPS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="22"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="29"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="63"/>
@@ -6245,7 +6256,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="70"/>
         <source>Longitude</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="87"/>
@@ -6265,22 +6276,22 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="114"/>
         <source>00</source>
-        <translation type="unfinished">00</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="121"/>
         <source>Fix Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="131"/>
         <source>Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="138"/>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="148"/>
@@ -6290,7 +6301,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="155"/>
         <source>Latitude</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6298,98 +6309,142 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/NameFinder/xmlstreamreader.cpp" line="45"/>
         <source>Not a proper results stream!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< E R A L D A J A  ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Tegevused</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Rakenda</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Katkesta</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< E R A L D A J A  ></translation>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6397,17 +6452,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="31"/>
         <source>Members</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
@@ -6420,22 +6475,22 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6443,37 +6498,37 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="34"/>
         <source>xxx</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="41"/>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="61"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6486,7 +6541,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/SatelliteStrengthView.cpp" line="50"/>
         <source>No satellites</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6494,17 +6549,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="14"/>
         <source>Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="25"/>
         <source>Key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="32"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="45"/>
@@ -6514,22 +6569,22 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="55"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6537,20 +6592,20 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="277"/>
         <source>Reset view</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6558,7 +6613,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/StyleDock.cpp" line="102"/>
         <source>Styles</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6566,7 +6621,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/StyleDock.ui" line="14"/>
         <source>Styles</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6574,22 +6629,22 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
         <source>Upload to Openstreetmap</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
         <source>Please specify a comment for this changeset.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="66"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="73"/>
@@ -6600,116 +6655,93 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>TMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
-        <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
-        <source>Error reading services.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
         <source>TMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="20"/>
         <source>TMS Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="47"/>
         <source>Server list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="78"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="99"/>
         <source>Server Url:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="111"/>
         <source>Get Services</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="133"/>
         <source>Services :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="143"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
         <source>Projection:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
         <source>Mercator (EPSG:900913)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
         <source>Lat/Lon (EPSG:4326)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
         <source>Origin is bottom-left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
@@ -6724,7 +6756,24 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="303"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
+        <source>Merkaartor: GetServices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
+        <source>Error reading services.
+</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6732,17 +6781,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TagModel.cpp" line="105"/>
         <source>Key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="107"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.h" line="22"/>
         <source>Edit this to add...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6750,12 +6799,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
@@ -6765,7 +6814,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6775,12 +6824,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6788,7 +6837,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/TagTemplate/TagTemplate.cpp" line="196"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6796,7 +6845,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/TagTemplate/TagTemplate.cpp" line="913"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6804,93 +6853,93 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
         <source>For example "1-9;15-17;19,19A"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
         <source>All numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
         <source>Extract - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation># rajaosa</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1t %2m</translation>
     </message>
@@ -6898,19 +6947,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6918,47 +6967,47 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="14"/>
         <source>Trackpoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="34"/>
         <source>Latitude</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="44"/>
         <source>Longitude</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="51"/>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="58"/>
         <source>xxx</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="81"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -6971,32 +7020,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="13"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="36"/>
         <source>Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="49"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="56"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="63"/>
         <source>Use proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="88"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="104"/>
@@ -7007,12 +7056,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Tühi</translation>
     </message>
@@ -7020,62 +7069,34 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="20"/>
         <source>WMS Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="47"/>
         <source>Server list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="78"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
         <source>Server Url:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
@@ -7087,44 +7108,44 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
         <source>Projection:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
         <source>Zoom levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
         <source>Image format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
         <source>Styles:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7139,7 +7160,35 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="348"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_fr.ts b/translations/merkaartor_fr.ts
index d424ae1..158c0e4 100644
--- a/translations/merkaartor_fr.ts
+++ b/translations/merkaartor_fr.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fr">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -9,47 +7,14 @@
         <translation>A propos de Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Ce programme est publié sous Licence Publique GNU v2</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
-    </message>
-    <message>
         <location filename="../src/common/AboutDialog.ui" line="30"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Version de Merkaartor</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -67,7 +32,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -80,7 +45,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Version de PROJ4</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -93,106 +58,164 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Version de GDAL</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Copyright Bart Vanhauwaert, Chris Browet et autres, 2006-2012</translation>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Ce programme est publié sous Licence Publique GNU v2</translation>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Historique des changements</translation>
     </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
 </context>
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Raccourci clavier</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importer</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Exporter</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>Par d&éfaut</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Annuler</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Editeur de raccourci</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Charger schéma de raccourcis</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Schéma de raccourci Merkaartor (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Impossible d'ouvrir le fichier</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 n'a pas pu être ouvert.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Sauvegarder schéma de raccourci</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>sans titre</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Impossible d'ouvrir le fichier de sauvegarde</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 n'a pas pu être ouvert en écriture.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -236,20 +259,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
+        <source>Undo</source>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="195"/>
@@ -261,11 +286,6 @@ p, li { white-space: pre-wrap; }
         <source>Center && Zoom map</source>
         <translation>Centrer && Zoomer la carte</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
-        <source>Undo</source>
-        <translation>Annuler</translation>
-    </message>
 </context>
 <context>
     <name>DirtyDockWidget</name>
@@ -279,7 +299,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -296,7 +316,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Faire un zoom</translation>
     </message>
@@ -304,21 +324,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyListExecutor</name>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="423"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="430"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="446"/>
-        <source>Error uploading request</source>
-        <translation>Erreur durant le téléversage de la requête</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="427"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="447"/>
-        <source>There was an error uploading this request (%1)
-Server message is '%2'</source>
-        <translation>Une erreur s'est produite durant le téléversage de cette requete (%1)
-Le message du serveur est '%2'</translation>
-    </message>
-    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="326"/>
         <location filename="../src/Sync/DirtyList.cpp" line="570"/>
         <source>ADD road %1</source>
@@ -373,19 +378,24 @@ Le message du serveur est '%2'</translation>
         <translation>SUPPRIMER relation %1</translation>
     </message>
     <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="423"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="430"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="446"/>
+        <source>Error uploading request</source>
+        <translation>Erreur durant le téléversage de la requête</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="424"/>
         <source>Please check your username and password in the Preferences menu</source>
         <translation>Veuillez vérifier l'exactitude de vos Identifiant et mot-de-passe dans le menu Préférences</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
-        <source>OPEN changeset</source>
-        <translation>OUVRIR changeset</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
-        <source>CLOSE changeset</source>
-        <translation>FERMER changeset</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="427"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="447"/>
+        <source>There was an error uploading this request (%1)
+Server message is '%2'</source>
+        <translation>Une erreur s'est produite durant le téléversage de cette requete (%1)
+Le message du serveur est '%2'</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
@@ -399,6 +409,16 @@ Le message de l'API est le suivant '%1'</translation>
         <source>Uploading changes...</source>
         <translation>Envoi des changements...</translation>
     </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
+        <source>OPEN changeset</source>
+        <translation>OUVRIR changeset</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
+        <source>CLOSE changeset</source>
+        <translation>FERMER changeset</translation>
+    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -501,97 +521,97 @@ Veuillez re-télécharger l'objet problématique pour gérer le conflit.</t
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>sans titre</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Calque des brouillons</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Couche Téléversé</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Imagerie d'arrière-plan</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>Export OSM</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Exportation OSM...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Document</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -619,12 +639,12 @@ Veuillez re-télécharger l'objet problématique pour gérer le conflit.</t
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -645,111 +665,73 @@ Veuillez re-télécharger l'objet problématique pour gérer le conflit.</t
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>erreur</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>n'a pas téléchargé suffisamment</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Conflits non-résolus</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Veuillez d'abord résoudre les conflits existants</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Téléchargement des points</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 téléchargement</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Échec du téléchargement</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Chargement des non-résolus</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Nom d'utilisateur/mot de passe non valable</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Téléchargement de la non résolution %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Téléchargement depuis OSM (connection)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Analyse syntaxique de la non résolution %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Téléchargement des noeuds %1-%2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Analyse...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
         <translation>Analyse XML</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
         <translation>Conflits de %1</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Téléchargement de %1,%2 (zoom %3)...</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Trace - Nœud téléchargés %1-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 téléchargement</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Routes/Relations vides détéctées</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Téléchargement de la non résolution %1 de %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Des routes/relations vides sont probablement des erreurs.
+Voulez-vous les marquer pour suppression ?</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Analyse syntaxique de la non résolution %1 de %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Supprimer l'objet vide %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
         <translation>Des conflits ont été détéctés</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
@@ -758,133 +740,160 @@ Les objets ont été duplicié avec un identifiant "conflict_..." sur
 Avant de pouvoir téléverser vos changements, vous devrez manuellement fusionner les deux versions et supprimer celle de la couche "Conflits".</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Routes/Relations vides détéctées</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Envoi en cours...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Des routes/relations vides sont probablement des erreurs.
-Voulez-vous les marquer pour suppression ?</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Préparation des changements</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Supprimer l'objet vide %1</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>En attente de la réponse du serveur</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>erreur</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Téléchargement en provenance d'OSM (%n octets)</numerusform>
-            <numerusform>Téléchargement en provenance d'OSM (%n octets)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Téléchargement en provenance d'OSM (%n kOctets)</numerusform>
-            <numerusform>Téléchargement en provenance d'OSM (%n kOctets)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Téléchargement...</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Téléchargement depuis OSM (connection)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation>Code état inattendu du protocole http (%1)
 Le serveur a répondu '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 Le message de l'API est le suivant '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Téléchargement...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Échec du téléchargement</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Analyse...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Nom d'utilisateur/mot de passe non valable</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Chargement des non-résolus</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Conflits non-résolus</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Envoi en cours...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Veuillez d'abord résoudre les conflits existants</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Préparation des changements</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Téléchargement des noeuds %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>En attente de la réponse du serveur</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Trace - Nœud téléchargés %1-%2</translation>
     </message>
-</context>
-<context>
-    <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Fermer</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
-        <source>Zoom</source>
-        <translation>Faire un zoom</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Téléchargement des points</translation>
     </message>
-</context>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Téléchargement de %1,%2 (zoom %3)...</translation>
+    </message>
+</context>
+<context>
+    <name>DrawingLayerWidget</name>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
+        <source>Zoom</source>
+        <translation>Faire un zoom</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+</context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation>Suppression impossible</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
         <translation>Suppression totale impossible</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -938,6 +947,11 @@ Delete what can be?</source>
         <translation>Charger les sous-éléments manquants</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Ajouter à la sélection</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
@@ -962,11 +976,6 @@ Delete what can be?</source>
         <source>All</source>
         <translation>Tous</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Ajouter à la sélection</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -988,7 +997,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1017,7 +1026,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
@@ -1027,7 +1036,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
@@ -1073,270 +1082,244 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Dépassement de temps réseau</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Impossible d'obtenir les détails de la photo depuis le serveur "Walking Papers".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Veuillez spécifier l'URL Walking Papers</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL :</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Images Géo.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Centrer la carte</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Enlever les images</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Copie du nom de fichier dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Sélectionner l'image suivante</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>PgDown</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Sélectionner l'image précédente</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>PgUp</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Sauvergarder l'image géomarquée</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Couche Photo</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Charger les images georeférencées</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>Séléctionnez le calque auquel l'image appartient:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Chargement des images...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Interrompre le chargement</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>Fichier inconnu</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>Impossible de trouver l'image "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>Erreur lors du chargement de "%2".
+%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Erreur lors du chargement des données EXIF de "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation>Spécifiez le décallage</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation>Positionner les images plus vers:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>la fin de la trace</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>début de la trace</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Pas de points de trace</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Pas de points de trace trouvé pour l'image "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'secondes'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'minutes et' ss 'secondes'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'heures,' mm 'minutes et' ss 'secondes'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>Pas la bonne image ?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>L'image "%1" a été prise %2 avant que le point de traçe suivant ne soit enregistré.
 Voulez vous quand même l'utiliser ?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>L'image "%1" a été prise %2 après que le point de traçe suivant ne soit enregistré.
 Voulez vous quand même l'utiliser ?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>Fichier inconnu</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Dépassement de temps réseau</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Impossible d'obtenir les détails de la photo depuis le serveur "Walking Papers".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Veuillez spécifier l'URL Walking Papers</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>URL :</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Centrer la carte</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Sauvergarder l'image géomarquée</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Couche Photo</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>Impossible de trouver l'image "%1"</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>Erreur lors du chargement de "%2".
-%1</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Pas de points de trace</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Pas de points de trace trouvé pour l'image "%1"</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>JPEG Images (*.jpg)</source>
         <translation>Images JPEG (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Erreur lors du chargement des données EXIF de "%1".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Erreur à l'ouverture de "%1".
 %2</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Sélectionner l'image suivante</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>PgDown</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Sélectionner l'image précédente</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>PgUp</translation>
-    </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>url OSM invalide</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>L'url spécifiée est invalide!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Format de coordonnées non valable</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Les coordonnées doivent être: '<lon gauche>, <lat bas>, <lon droite>, <lat haut>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Les coordonnées doivent être: '<lat centre>, <lon centre>, <lat intervalle>, <lon intervalle>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Aller à</translation>
@@ -1349,17 +1332,17 @@ Voulez vous quand même l'utiliser ?</translation>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1392,123 +1375,149 @@ Voulez vous quand même l'utiliser ?</translation>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>url OSM invalide</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>L'url spécifiée est invalide!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Format de coordonnées non valable</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Les coordonnées doivent être: '<lon gauche>, <lat bas>, <lon droite>, <lat haut>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Les coordonnées doivent être: '<lat centre>, <lon centre>, <lat intervalle>, <lon intervalle>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Adaptateur d'enveloppe</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Faire un zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>Adapteur WMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>Adapteur TMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Carte - Aucune</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Carte - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Carte - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Carte - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Carte - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Taille de la tuile</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Projection</translation>
     </message>
@@ -1516,120 +1525,21 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Chaîne de caractères</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Boîte de dialogue</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Entier</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Flottant</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Longitude</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Latitude</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Projection invalide</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Impossible de spécifier la projection.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Pas de coordonnées</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Le champ Latitude ou Longitude est manquant. Il sera impossible d'importer le fichier.
-Désirez-vous réellement quitter?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Charger une configuration d'import CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Configuration d'import Merkaartor (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Fichier invalide</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 n'a pas pu être ouvert.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 n'est pas un fichier de configuration d'import CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>Sauvegarder la configuration d'import CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>sans titre</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Tous les fichiers (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>Impossible d'ouvrir la configuration d'import</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 n'a pas pu être ouvert en écriture.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Boîte de dialogue</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
-        <source>Input</source>
-        <translation>Entrée</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
+        <source>Input</source>
+        <translation>Entrée</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1692,7 +1602,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1702,12 +1612,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
@@ -1764,18 +1674,117 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Sauvergarder la configuration...</translation>
     </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Chaîne de caractères</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Entier</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Flottant</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Longitude</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Latitude</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Projection invalide</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Impossible de spécifier la projection.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Pas de coordonnées</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Le champ Latitude ou Longitude est manquant. Il sera impossible d'importer le fichier.
+Désirez-vous réellement quitter?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Charger une configuration d'import CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Configuration d'import Merkaartor (*.mis)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Fichier invalide</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 n'a pas pu être ouvert.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 n'est pas un fichier de configuration d'import CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>Sauvegarder la configuration d'import CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>sans titre</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Tous les fichiers (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>Impossible d'ouvrir la configuration d'import</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 n'a pas pu être ouvert en écriture.</translation>
+    </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1789,21 +1798,18 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n objets</numerusform>
-            <numerusform>%n fonctionnalités</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Objets</translation>
     </message>
@@ -1811,21 +1817,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Couches</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Tous</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>Pistes</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
         <source>Show All</source>
@@ -1853,9 +1844,19 @@ p, li { white-space: pre-wrap; }
         <translation>Fermer</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Couches</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Tous</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
@@ -1863,68 +1864,73 @@ p, li { white-space: pre-wrap; }
         <translation>Dessiner</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>Pistes</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
-        <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
-        <source>There are dirty features on this layer.
-Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
-        <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
+        <source>Visible</source>
+        <translation>Visible</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
-        <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
+        <source>Readonly</source>
+        <translation>Lecture seule</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Bas</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Haut</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Opaque</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Opacité</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
-        <source>Visible</source>
-        <translation>Visible</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <source>Layer CLose: Dirty objects present</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
-        <source>Readonly</source>
-        <translation>Lecture seule</translation>
-    </message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
+        <source>There are dirty features on this layer.
+Are you sure you want to close it? (no Undo possible)</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulaire</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <source>Layer CLose: Not empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
+        <source>Are you sure you want to close this layer? (no Undo possible)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1932,12 +1938,12 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
@@ -1956,2791 +1962,2816 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Initialisation...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Changements non sauvegardés</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>Le document contient des changements non-sauvegardés qui seront perdus.
-Voulez-vous annuler le chargement d'un nouveau document ou continuer et perdre les changements ?</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Aide</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Créer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Route</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Fichier invalide</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Editer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 n'a pas pu être ouvert.</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Vue</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Signets</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Spécifier la &projection</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Définir l'&opacité des aires</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Téléverser OSM</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Fichier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Erreur de téléchargement</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Exporter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>La carte n'a pas pu être téléchargée</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Ouvert ré&cemment</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Erreur lors du téléchargement deuis OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Impor&ter récemment</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>Le téléchargement OpenStreetBugs a échoué</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>&Outils</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Style</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Simplifier les Routes</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Nœud</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Dépassement de temps réseau</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Fenêtre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Impossible de contacter OpenStreetBugs.</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Encarts</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Erreur lors de la cloture du bogue</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Obje&t</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Impossible de supprimer le bug. Le message du serveur est:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Ajout de Numéros de rue</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Calques</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&ation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Afficher les flêches directionelles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>triangulaire</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Quitter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>rectangulaire</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&A propos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>pentagonal</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Ouvrir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>hexagonal</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Crée un nouveau document et importe un fichier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>heptagonal</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>octogonal</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Faire un zoom sur &tout</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>Aligne sur les %1 axes</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>Aligne sur les %1 axes réguliers</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Faire un zoom sur la &fenêtre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Zoomer la fenêtre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>Zoom a&rrière</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>Zoom &avant</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Zoom avant</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Liaison courbe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Défaire</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Sauvergarder le style de carte</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Style de carte Merkaartor (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Refaire</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Charger un Style de carte</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Formats pris en charge</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Déplacer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Tous les fichiers (*)</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importe un fichier dans le document courant</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Télécharger</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Télécharger des données cartographique pour une nouvelle aire</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Exporter OSM</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>Fichiers OSM (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Lien</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Exporter osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Créer une liaison</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>Fichiers osmChange (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Ajouter un marque-page</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Sélectionner</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Spécifiez le nom du signet.</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Nom de signet invalide</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Un marque-page ne peut être vide.</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Attention: le nom du marque-page existe déjà</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Envoyer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Entrez un nouveau nom, gardez le même pour remplacer ou annulez.</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Téléverser les changements sur le serveur</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Supprimer le signet</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Sélectionnez le signet à supprimer.</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>&Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Enlever les objets sélectionnés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Aide</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Créer une nouvelle route</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Créer</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Route</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Créer un nouveau nœud</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Editer</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Vue</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Inverser le sens</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Signets</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Inverser la direction de la route</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Spécifier la &projection</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Aller à...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Fichier</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Style</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>Route à &double sens</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Nœud</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Crée une voie à deux bandes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Quitter</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&A propos</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Créer un rond-point</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Ouvrir</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Nouveau</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Crée un nouveau document et importe un fichier</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Crée un nouveau document</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Faire un zoom sur &tout</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Séparer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Séparer la route en deux portions (collées)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Faire un zoom sur la &fenêtre</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Zoomer la fenêtre</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Joindre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Joindre les routes connectées en une seule</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>Zoom a&rrière</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>Zoom &avant</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Séparer à part</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Zoom avant</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Séparer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Liaison courbe</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Séparer des routes connectées</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Défaire</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&lation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Refaire</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Crée une relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Surface</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importer</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Créer une nouvelle zone</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importe un fichier dans le document courant</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Modifier...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Sauvegarder &sous...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Lien</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Charger...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Créer une liaison</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>Route &sinueuse</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Préférences...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Tous...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Exporte toutes les couches visibles vers un fichier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>&Supprimer</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Rechercher...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Rechercher</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Inverser le sens</translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Recherche et sélectionne des éléments</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>Route à &double sens</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>Fenêtre de &Vue...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Nouveau</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Exporte les objets de la vue vers un fichier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Crée un nouveau document</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Ajouter...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Séparer</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Supprimer...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Joindre</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Fusionner</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Séparer à part</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Fusionner des Nœuds</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&lation</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Fusionne les nœuds sélectionnés (le premier sélectionné restera)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Surface</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
         <source>&Save</source>
         <translation>&Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>Route &sinueuse</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Enregistrer dans un fichier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Préférences...</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Tous...</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Télécharger plus</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Exporte toutes les couches visibles vers un fichier</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Télécharger des données cartographiques supplémentaires pour la zone actuelle</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>Fenêtre de &Vue...</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Télécharge la vue courante dans la derniére couche de téléchargement</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Exporte les objets de la vue vers un fichier</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Ajouter...</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Propriétés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Supprimer...</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Cacher/afficher l'encart Propriétés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Fusionner</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Fusionne les nœuds sélectionnés (le premier sélectionné restera)</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Cacher/afficher l'encart Couches</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>Conflits non-résolus</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Veuillez d'abord résoudre les conflits existants</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Info</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Il semble que vous n'avez pas spécifié
-vos identifiant et mot-de-passe OpenStreetMap.
-Voulez-vous le faire maintenant ?</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Cacher/afficher l'encart Informations</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Enregistrer un document Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Fichiers document Merkaartor (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Aligner</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Aligner les nœuds</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Aligne les nœuds sélectionnés. Les deux premiers sélectionnés indiquent la ligne.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Sauvegarder &sous...</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>&Etendre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Télécharger plus</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Télécharge la vue courante dans la derniére couche de téléchargement</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Cacher/afficher l'encart Défaire</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Version ancienne de Qt détectée</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Votre configuration utilise Qt %1, qui contient un certain nombre d'erreurs connues lors du chargement vers OpenStreetMap, menant à des codes de réponse 401 du serveur. Etes-vous certain de vouloir continuer (ce qui n'est pas recommandé) ?
-Pour plus d'information, voir http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor (en anglais)</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Afficher les aires &téléchargées</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>sans titre</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Fenêtre</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Copier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Encarts</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Copie les objets sélectionnés vers le presse-papier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Cacher/afficher l'encart Propriétés</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Copie les étiquettes de l'objet sélectionné vers le clipboard; Si l'objet est un noeud, copie également les coordonnées.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Cacher/afficher l'encart Couches</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Coller Étiquettes (&Écraser)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Colle (et écrase) les étiquettes de l'objet sélectionné à partir du clipboard.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Cacher/afficher l'encart Informations</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Coller Étiquettes (&Fusionner)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Coller Étiquettes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Coller les tags du presse-papiers (Fusion avec les tags existants)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Fusionne les étiquettes du clipboard avec celles de l'objet sélectionné.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Sélectionné...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Coller l(es) objet(s)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Rechercher...</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Coller les objets depuis le presse-papiers</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Recherche et sélectionne des éléments</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Colle les objets du clipboard; Si les identificateurs des objets sont déjà dans le document, ces derniers seront écrasés.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Aligner</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Aligne les nœuds sélectionnés. Les deux premiers sélectionnés indiquent la ligne.</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binaire)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Forcer l'envoi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Fichier invalide</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Appliquer l'objet à la couche "Modifications"</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Il est fortement recommandé de sauvegarder les changements de votre document après un télévesage.
-Voulez-vous le faire maintenant ?</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Déplace les objets sélectionné d'une couche non-téléversable vers la couche modification, prêts pour téléversage</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Supprimer l'étiquette '%1' sur %2</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Créer Surface %1</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Surface: Créer Route %1</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Basculer la barre d'outils</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Surface: Terminer Route %1</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Cacher/afficher la barre d'outils</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Zone: Ajouter le nœud %1 à la route %2</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Cacher tout</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>Fermeture de l'aire %1</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Afficher tout</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Ajouter des nœuds à la route à double-sens %1</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>Calque &image</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Créer la Route à double-sens %1</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>Images mat&ricielles/SVG</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Créer un nœud sur la route: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Afficher les &noeuds</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Création POI %1</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Créer le Rond-point %1</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Afficher les no&ms</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Créer le Nœud %1 sur la route %2</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Créer la Route: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>Démarrer</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Fermeture de la route %1</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Démarrer le GPS</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Rejouer...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Rejouer GPS</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Supprimer l'objet %1</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Cacher/afficher l'encart GPS</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>&Arrêter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Presse-papiers non valable</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Arreter le GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Joindre des Routes</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centrer sur le point GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Séparer des Routes</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Afficher les &segments de trace</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Casser des Routes</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Créer la Relation %1</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Afficher l'&échelle</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Aligner les nœuds</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Fusionner des Nœuds dans %1</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Afficher les &relations</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Cacher/afficher l'encart Défaire</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Afficher l'arrière-plan des routes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Copie les étiquettes de l'objet sélectionné vers le clipboard; Si l'objet est un noeud, copie également les coordonnées.</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Afficher les bordures des routes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Afficher le touchup</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Colle (et écrase) les étiquettes de l'objet sélectionné à partir du clipboard.</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Enregistrer le GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Fusionne les étiquettes du clipboard avec celles de l'objet sélectionné.</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Mettre le GPS en pause</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Sélectionné...</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>Image géoréférencée</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Colle les objets du clipboard; Si les identificateurs des objets sont déjà dans le document, ces derniers seront écrasés.</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Cacher/afficher l'encart GeoImage</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Relation Modifiée %1</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Gestionnaire "World OSB"...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 n'est pas un document Merkaartor valide.</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>Editeur de &raccourci</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Exporter GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Fusionner...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Fichiers GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Sauvegarder...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exporter KML</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Ajouter un membre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Fichiers KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Retirer le membre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Jamais</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>pour &Routes à sens unique</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binaire)</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Toujours</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Déplace les objets sélectionné d'une couche non-téléversable vers la couche modification, prêts pour téléversage</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Détacher</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Détacher un nœud d'une route</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Détacher un nœud d'une route</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Mettre Étiquettes sur %1</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Travailler déconnecté</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Créer le nœud: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Ajouter le nœud %1 à la route %2</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Styles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>tuile %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Cacher/Afficher l'encart Styles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Propriétés...</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Noeud intermédiaire</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>Editeur des Serveurs &WMS...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Trace %1</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>Editeur des Serveurs &TMS...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>Erreur du GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Réinitialiser le status des boîtes de dialogue cachées</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Impossible d'ouvrir le port de l'instrument GPS.</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Menu GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Ouvrir un fichier de journalisation NMEA</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Appareil photo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Calques</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Créer &Carrefour</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Afficher les aires &téléchargées</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Pivoter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Basculer la barre d'outils</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Cacher/afficher la barre d'outils</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Cacher tout</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Afficher tout</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Objets</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>Calque &image</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Ajouter des Numéro de Rue (Système "Karlsruhe")</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Subdiviser</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>Démarrer</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Rejouer...</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Afficher les nœuds &virtuels</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Cacher/afficher l'encart GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Afficher la &grille lat/lon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>B&loquer le zoom en fonction de l'arrière-plan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>&Editeur de &projection...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>&Arrêter</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>Afficher les &Photos sur la carte</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centrer sur le point GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Afficher les &segments de trace</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Suppression forcée</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Afficher l'&échelle</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>S&implifier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Afficher les &relations</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Simplifier la(les) route(s)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>Simplifier la route en retirant les noeuds fils superflus</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Afficher l'arrière-plan des routes</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>Editeur de &Filtres...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Afficher les bordures des routes</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>Aucu&n</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Afficher le touchup</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Enregistrer</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Cacher/afficher l'encart GeoImage</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>&Séparer la Surface</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Nœuds trouvés avec la même position</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Voulez-vous fusionner tous les nœuds à la destination ?</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Bas</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Haut</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Opaque</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>Fichier</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Edition</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>Im&pression</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Flèches directionnelles</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Propriétés...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Couches</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Création</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Objet</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Noeud</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Route</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relation</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>Fichier GPS Exchange (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>Fichier OpenStreetMap (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>Format de changement OpenStreetMap (*.osc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Fichier Noni GPSPlot (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>Fichier journal NMEA GPS (*.nmea *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>Mise à l'échelle</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>Fichier KML (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Format CSV (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Images géolocalisées (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>fichier d'enveloppe ESRI (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Fichier Merkaartor (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Route</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Charger une image</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Ajouter la postion du noeud à l'image</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Géo-éttiquette l'image avec cette position</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Charger les sous-éléments manquants</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Outils</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Supprimer l'étiquette '%1' sur %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Aide</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Supprimer les étiquettes %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Le presse-papier ne contient pas de données valide.</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Retire le membre '%1' de %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Réordonner les membres dans la relation %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Gros lourd avertissement de droits d'auteur</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Relation Modifiée %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Vous tentez d'importer un fichier KML. Veuillez noter que:
-
- - Vous ne pouvez pas importer dans OSM un fichier KML créé par vous dans Google Earth. Vous pourriez penser que les nœuds que vous avez créés sont votre propriété, il n'en est rien!
-Ils sont un travail dérivé de GE et ne peuvent pour cela pas être importés dans OSM.
-
- - Si vous l'avez téléchargé de l'internet, il est probable qu'il soit sous copyright.
-Veuillez vous assurer que l'utilisation de ces données dans OSM est permise par l'auteur ou que ces données soient dans le domaine public.
-
-En cas de doute, demandez un avis sur les listes de diffusion OSM "legal" et/ou "talk".
-
-Êtes-vous absolument certain que ce fichier KML peut être importé légalement dans OSM?</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Création d'un Noeud</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Détacher le nœud %1</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Créer un nœud sur la route: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Ajouter le membre à la relation</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Création d'une Surface</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Enlever le membre de la relation</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Créer Surface %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Surface: Créer Route %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Impossible d'ouvrir le fichier de sauvegarde</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Ajouter un trou.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 n'a pas pu être ouvert en écriture.</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Voulez-vous ajouter un (nouveau) trou à cette surface ?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Surface: Terminer Route %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
-    </message>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Zone: Ajouter le nœud %1 à la route %2</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Fermeture de l'aire %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Sauvergarder Template d'étiquette</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Template d'étiquette Merkaartor (*.mat)</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Ajouter des nœuds à la route à double-sens %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Ouvrir Template d'étiquette</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Créer la Route à double-sens %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Afficher les flêches directionelles</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Création POI %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Définir l'&opacité des aires</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>CLIC-GAUCHE pour démarrer; GLISSER pour échelonner; SHIFT-GLISSER pour pivoter; CLIC-GAUCHE pour terminer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Exporter</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Création d'un Polygone</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Ouvert ré&cemment</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Créer polygone %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Impor&ter récemment</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Création d'un Rond-Point</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>&Outils</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Créer le Rond-point %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Obje&t</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Création d'une Voie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Créer le Nœud %1 sur la route %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Créer la Route: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&ation</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Créer le nœud: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Ajouter le nœud %1 à la route %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Fermeture de la route %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Déplacer</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Télécharger</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Télécharger des données cartographique pour une nouvelle aire</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Édition</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Sélectionner</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Supprimer l'objet %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Envoyer</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Téléverser les changements sur le serveur</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Supprimer l'enfant.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Enlever les objets sélectionnés</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Créer une nouvelle route</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Créer un nouveau nœud</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Inverser la direction de la route</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>CLIC-GAUCHE pour sélectionner; GLISSER-GAUCHE pour déplacer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Aller à...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Déplacement de Noeud</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Crée une voie à deux bandes</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Déplacer les nœuds</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Créer un rond-point</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Déplacer nœud %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Séparer la route en deux portions (collées)</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Nœuds trouvés avec la même position</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Joindre les routes connectées en une seule</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Voulez-vous fusionner tous les nœuds à la destination ?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Séparer</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Fusionner des Nœuds dans %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Séparer des routes connectées</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Crée une relation</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Rotation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Créer une nouvelle zone</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Modifier...</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Sauvegarder...</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Charger...</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>CLIC-GAUCHE pour le premier coin -> GLISSER-GAUCHE pour spécifier la surface -> CLIC-GAUCHE pour zoomer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Rechercher</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Fusionner des Nœuds</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>Fichier GPS Exchange (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Enregistrer dans un fichier</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>Fichier OpenStreetMap (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Télécharger des données cartographiques supplémentaires pour la zone actuelle</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>Format de changement OpenStreetMap (*.osc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Propriétés</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Fichier Noni GPSPlot (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Info</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>Fichier journal NMEA GPS (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Aligner les nœuds</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>Fichier KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>&Etendre</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Format CSV (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Images géolocalisées (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>fichier d'enveloppe ESRI (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Copier</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Copie les objets sélectionnés vers le presse-papier</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Coller Étiquettes (&Écraser)</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Formats pris en charge</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Coller Étiquettes (&Fusionner)</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Fichier Merkaartor (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Coller Étiquettes</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Coller les tags du presse-papiers (Fusion avec les tags existants)</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>tuile %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Coller</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Impossible de charger le fichier de projections</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projection.xml" ne peut être ouvert nulle part. Abandon.</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Bas</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Haut</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Opaque</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Objet</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Noeud</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Coller les objets depuis le presse-papiers</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Route</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Appliquer l'objet à la couche "Modifications"</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>Images mat&ricielles/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Charger une image</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>Afficher les &noeuds</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Ajouter la postion du noeud à l'image</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Afficher les no&ms</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Géo-éttiquette l'image avec cette position</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Démarrer le GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Rejouer GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Edition</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Arreter le GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Enregistrer le GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Flèches directionnelles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Mettre le GPS en pause</translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>Image géoréférencée</translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Couches</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Gestionnaire "World OSB"...</translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Création</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>Editeur de &raccourci</translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Route</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Fusionner...</translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Outils</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Ajouter un membre</translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Retirer le membre</translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Jamais</translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>pour &Routes à sens unique</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Presse-papiers non valable</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Toujours</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Le presse-papier ne contient pas de données valide.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Détacher</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Détacher un nœud d'une route</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Changements non sauvegardés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Détacher un nœud d'une route</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>Le document contient des changements non-sauvegardés qui seront perdus.
+Voulez-vous annuler le chargement d'un nouveau document ou continuer et perdre les changements ?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Travailler déconnecté</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Styles</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Noeud intermédiaire</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Cacher/Afficher l'encart Styles</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Trace %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>Editeur des Serveurs &WMS...</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Gros lourd avertissement de droits d'auteur</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>Editeur des Serveurs &TMS...</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Vous tentez d'importer un fichier KML. Veuillez noter que:
+
+ - Vous ne pouvez pas importer dans OSM un fichier KML créé par vous dans Google Earth. Vous pourriez penser que les nœuds que vous avez créés sont votre propriété, il n'en est rien!
+Ils sont un travail dérivé de GE et ne peuvent pour cela pas être importés dans OSM.
+
+ - Si vous l'avez téléchargé de l'internet, il est probable qu'il soit sous copyright.
+Veuillez vous assurer que l'utilisation de ces données dans OSM est permise par l'auteur ou que ces données soient dans le domaine public.
+
+En cas de doute, demandez un avis sur les listes de diffusion OSM "legal" et/ou "talk".
+
+Êtes-vous absolument certain que ce fichier KML peut être importé légalement dans OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Fichier invalide</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 n'a pas pu être ouvert.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Ajouter des Numéro de Rue (Système "Karlsruhe")</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Subdiviser</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>Afficher la &grille lat/lon</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Version ancienne de Qt détectée</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>B&loquer le zoom en fonction de l'arrière-plan</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Votre configuration utilise Qt %1, qui contient un certain nombre d'erreurs connues lors du chargement vers OpenStreetMap, menant à des codes de réponse 401 du serveur. Etes-vous certain de vouloir continuer (ce qui n'est pas recommandé) ?
+Pour plus d'information, voir http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor (en anglais)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>&Editeur de &projection...</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Téléverser OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>Afficher les &Photos sur la carte</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Il semble que vous n'avez pas spécifié
+vos identifiant et mot-de-passe OpenStreetMap.
+Voulez-vous le faire maintenant ?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Erreur de téléchargement</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Suppression forcée</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>La carte n'a pas pu être téléchargée</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Erreur lors du téléchargement deuis OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>Le téléchargement OpenStreetBugs a échoué</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Créer polygone</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Précisez le nombre de côtés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Joindre des Routes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Séparer des Routes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Casser des Routes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Simplifier les Routes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Forcer l'envoi de l'objet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Dépassement de temps réseau</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Charger les sous-éléments manquants</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Impossible de contacter OpenStreetBugs.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Fermer</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Erreur lors de la cloture du bogue</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>S&implifier</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Impossible de supprimer le bug. Le message du serveur est:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Simplifier la(les) route(s)</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Créer Carrefour</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Simplifier la route en retirant les noeuds fils superflus</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Intersections Multiples</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>Editeur de &Filtres...</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Ces routes ont de multiples intersections.
+Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non désirées peuvent toujours être supprimées par après)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>Aucu&n</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Ajout de Numéros de rue</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>&Séparer la Surface</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>triangulaire</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>rectangulaire</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>pentagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>hexagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>heptagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>octogonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>Aligne sur les %1 axes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>Aligne sur les %1 axes réguliers</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>Im&pression</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Aligner les nœuds</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Détacher le nœud %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation>Alt+X</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Ajouter le membre à la relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Enlever le membre de la relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>Mise à l'échelle</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Retire le membre '%1' de %2</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Créer la Relation %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Ajouter un trou.</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Sauvergarder le style de carte</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Voulez-vous ajouter un (nouveau) trou à cette surface ?</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Style de carte Merkaartor (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Impossible de charger le fichier de projections</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Charger un Style de carte</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>"Projection.xml" ne peut être ouvert nulle part. Abandon.</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Créer Carrefour</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Projection invalide</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Impossible d'appliquer la projection "%1".</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>sans titre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Réinitialiser le status des boîtes de dialogue cachées</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Enregistrer un document Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Menu GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Fichiers document Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Appareil photo</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Créer &Carrefour</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Impossible d'ouvrir le fichier de sauvegarde</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Supprimer l'enfant.</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 n'a pas pu être ouvert en écriture.</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Appliquer étiquettes sur objets multiples</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Création d'une Surface</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Fichier invalide</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Création d'un Noeud</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 n'est pas un document Merkaartor valide.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>CLIC-GAUCHE pour démarrer; GLISSER pour échelonner; SHIFT-GLISSER pour pivoter; CLIC-GAUCHE pour terminer</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Exporter OSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Création d'un Polygone</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>Fichiers OSM (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Créer polygone %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Exporter osmChange</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Création d'un Rond-Point</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>Fichiers osmChange (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Création d'une Voie</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Exporter GPX</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Édition</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Fichiers GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Déplacer les nœuds</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Exporter KML</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Déplacer nœud %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Fichiers KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>CLIC-GAUCHE pour sélectionner; GLISSER-GAUCHE pour déplacer</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Déplacement de Noeud</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Rotation</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Ajouter un marque-page</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>CLIC-GAUCHE pour le premier coin -> GLISSER-GAUCHE pour spécifier la surface -> CLIC-GAUCHE pour zoomer</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Spécifiez le nom du signet.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Zoom</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Nom de signet invalide</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Créer polygone</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Un marque-page ne peut être vide.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Précisez le nombre de côtés</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Attention: le nom du marque-page existe déjà</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Forcer l'envoi de l'objet</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Entrez un nouveau nom, gardez le même pour remplacer ou annulez.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Forcer l'envoi</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Supprimer le signet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Pivoter</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Sélectionnez le signet à supprimer.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Projection invalide</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Intersections Multiples</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Impossible d'appliquer la projection "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Ces routes ont de multiples intersections.
-Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non désirées peuvent toujours être supprimées par après)?</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>Erreur du GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Coller l(es) objet(s)</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Impossible d'ouvrir le port de l'instrument GPS.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Objets</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Ouvrir un fichier de journalisation NMEA</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Sauvergarder Template d'étiquette</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Afficher les nœuds &virtuels</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Template d'étiquette Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Supprimer les étiquettes %1 de %2</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Ouvrir Template d'étiquette</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Réordonner les membres dans la relation %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Conflits non-résolus</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Veuillez d'abord résoudre les conflits existants</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Il est fortement recommandé de sauvegarder les changements de votre document après un télévesage.
+Voulez-vous le faire maintenant ?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Appliquer étiquettes sur objets multiples</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Mettre Étiquettes sur %1</translation>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation><i>V: </i><b>%1</b> </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>dernier: </i><b>%1</b> par <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation><i>dernier: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
         <translation><br/><i>Calque: </i><b>%1</b> </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Noeud intermédiaire</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>coordonnées</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>description</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>commentaire</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Noeud</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>élévation</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>vitesse</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>taille</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>membres</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>En haut à gauche</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>BasDroit</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Relation</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Role</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Membre</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Route</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>coordonnées</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Noeud</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>%1 nœuds</translation>
+        <location filename="../src/Features/Way.cpp" line="903"/>
+        <source>Closed way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Longueur</translation>
     </message>
     <message>
         <location filename="../src/Features/Way.cpp" line="908"/>
-        <source>Closed way</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Aire</translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>%1 nœuds</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>élévation</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Aire</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>vitesse</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Route</translation>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Noeud intermédiaire</translation>
+        <location filename="../src/common/MapView.cpp" line="339"/>
+        <source>%1 m/pixel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>description</translation>
+        <location filename="../src/common/MapView.cpp" line="345"/>
+        <source>Align: %1m @ %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>commentaire</translation>
+        <location filename="../src/common/MapView.cpp" line="351"/>
+        <source>%1ms</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="384"/>
         <source>%1 m</source>
@@ -4752,32 +4783,17 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="339"/>
-        <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="345"/>
-        <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="351"/>
-        <source>%1ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Projection</translation>
     </message>
@@ -4785,34 +4801,44 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Nouveau serveur</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Nouveau signet</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Echec du chargement des préférences</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Dupliquer la clé</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Plus de 150 préférences</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Nouveau signet</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Nouveau serveur</translation>
     </message>
 </context>
 <context>
@@ -4841,17 +4867,17 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Classe</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Champ inconnu</translation>
     </message>
@@ -4864,25 +4890,10 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>Erreur!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Le service de recherche de nom est injoignable.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Le service de recherche de nom à refusé la connexion.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Le service de recherche de nom demande une authentification</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Erreur inconnue.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4903,11 +4914,6 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4915,6 +4921,11 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4941,7 +4952,7 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
@@ -4956,12 +4967,12 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
@@ -4971,12 +4982,12 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
@@ -4991,7 +5002,7 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5020,65 +5031,26 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Toujours</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Choisir une couleur</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Editeur de Style de carte</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
-        <source>Add</source>
-        <translation>Ajouter</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
-        <source>Remove</source>
-        <translation>Supprimer</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
-        <source>Tag selection</source>
-        <translation>Sélection d'étiquette</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
-        <source>meter/pixel</source>
-        <translation>mètre/pixel</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
-        <source>Visible up to</source>
-        <translation>Visible jusqu'à</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
+        <source>Global</source>
+        <translation>Global</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
-        <source>Visible from scale</source>
-        <translation>Visible à partie de l'échelle</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
+        <source>Background</source>
+        <translation>Arrière-plan</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
@@ -5097,6 +5069,11 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
@@ -5117,26 +5094,19 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>Epaisseur fixe</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
-        <source>Dashed</source>
-        <translation>Pointillé</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
-        <source>off</source>
-        <translation>désactivé</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
+        <source>Filter</source>
+        <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
-        <source>Fill area</source>
-        <translation>Remplir la surface</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
+        <source>Add</source>
+        <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
-        <source>Draw icon</source>
-        <translation>Dessiner l'icône</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
@@ -5144,20 +5114,25 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>Dupliquer</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
-        <source>Background</source>
-        <translation>Arrière-plan</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
+        <source>Tag selection</source>
+        <translation>Sélection d'étiquette</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
+        <source>meter/pixel</source>
+        <translation>mètre/pixel</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
-        <source>Filter</source>
-        <translation>Filtre</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
+        <source>Visible up to</source>
+        <translation>Visible jusqu'à</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
+        <source>Visible from scale</source>
+        <translation>Visible à partie de l'échelle</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5167,9 +5142,26 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>Dessiner avec la couleur</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
+        <source>Dashed</source>
+        <translation>Pointillé</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
+        <source>off</source>
+        <translation>désactivé</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
+        <source>Fill area</source>
+        <translation>Remplir la surface</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5179,12 +5171,12 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5197,9 +5189,14 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>Dessiner les marches</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
+        <source>Draw icon</source>
+        <translation>Dessiner l'icône</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5217,6 +5214,16 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>Marquage de l'étiquette</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
+        <source>Halo</source>
+        <translation>Auréole</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
+        <source>Area</source>
+        <translation>Aire</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
         <translation>Dessiner avec la couleur d'arrière-plan</translation>
@@ -5227,19 +5234,23 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <translation>Label avec l'étiquette de fond</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
-        <source>Global</source>
-        <translation>Global</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
-        <source>Halo</source>
-        <translation>Auréole</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Toujours</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
-        <source>Area</source>
-        <translation>Aire</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Choisir une couleur</translation>
     </message>
 </context>
 <context>
@@ -5258,7 +5269,7 @@ Voulez-vous créer un carrefour pour chacune d'elles? (Les carrefours non d
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
@@ -5289,6 +5300,11 @@ What do you want to do next?</source>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Boîte de dialogue</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5302,6 +5318,11 @@ What do you want to do next?</source>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>Fichiers SVG (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
         <translation>Tous les fichiers (*)</translation>
@@ -5311,16 +5332,6 @@ What do you want to do next?</source>
         <source>Image files (*.png *.jpg)</source>
         <translation>Fichiers images (*.png *.jpg)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Boîte de dialogue</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>Fichiers SVG (*.svg)</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -5350,162 +5361,115 @@ What do you want to do next?</source>
         <translation>Opacité bas/haut</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Style de carte</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Personnalisé</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Mot-de-passe:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Réseau</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Configuration du Proxy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Utiliser un serveur mandataire</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Nom d'hôte:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Image d'arrière-plan</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
-        <translation>Répertoire du cache</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Taille du cache (en Mb; 0 pour désactiver)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
-        <translation>Adapteur de carte</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
+        <source>Single mouse button interaction</source>
+        <translation>Interaction avec un seul bouton de souris</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Données</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
+        <source>Use custom Qt style</source>
+        <translation>Utiliser un style Qt personnalisé</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Documents</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
-        <source>Autosave documents after upload</source>
-        <translation>Sauvegarder automatiquement les documents après téléversage</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Mode de déplacement séparé</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Inclus</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Utiliser les nœuds virtuels (nouvelle session nécessaire)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Désactiver les styles pour les couches de piste</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Relations sélectionnables quand cachées</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
-        <source>Tracks</source>
-        <translation>Pistes</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
+        <source>Colors</source>
+        <translation>Couleurs</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
-        <source>Automatically extract tracks on open</source>
-        <translation>Extraire automatiquement les pistes à l'ouverture</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
+        <source>Background</source>
+        <translation>Arrière-plan</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Choisir une couleur</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>L'outil existe déjà</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
+        <source>Overwrite style</source>
+        <translation>Ecraser le style</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Un outil portant ce nom existe déjà.
-Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vous désirer modifier celui existant</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>Trace GPX</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Impossible de supprimer l'outil prédéfini</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
+        <source>Pixels</source>
+        <translation>Pixels</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Impossible de supprimer l'outil prédéfini "%1"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Utiliser l'apparence simplifiée pour les traces GPX</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Impossible de modifier le nom d'un outil prédéfini</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Interface</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Impossible de modifier le nom de l'outil prédéfini "%1"'</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Survoler</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Séléctionnez l'exécutable de l'outil</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Relations</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Focalisation</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Surligner</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Séléctionnez le dossier des fichiers de journalisation</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
@@ -5528,65 +5492,111 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Traduire les marquages standards</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
-        <source>Colors</source>
-        <translation>Couleurs</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
+        <source>Rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
-        <source>Background</source>
-        <translation>Arrière-plan</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
+        <source>Options</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Survoler</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
+        <source>Use Anti-aliasing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Focalisation</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
+        <source>Disable Anti-alisaing while panning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Relations</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
+        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
+        <source>Use current style for wireframe rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
+        <source>Editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
+        <source>Quick editing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
+        <source>Wireframe editing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
+        <source>Full render editing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Style de carte</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Répertoire des styles personnalisés</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Style actuel</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Désactiver les styles pour les couches de piste</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Modèle</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Modèkle de tag</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Inclus</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Personnalisé</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Données</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
@@ -5597,204 +5607,198 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Documents</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
-        <source>Save NMEA log</source>
-        <translation>Sauver les fichiers de journalisation NMEA</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation>Mettre l'horloge système à celle du GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
+        <source>Autosave documents after upload</source>
+        <translation>Sauvegarder automatiquement les documents après téléversage</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>Activer le serveur local compatible JOSM sur le port 8111</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
+        <source>Tracks</source>
+        <translation>Pistes</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
-        <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
+        <source>Automatically extract tracks on open</source>
+        <translation>Extraire automatiquement les pistes à l'ouverture</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
-        <source>Tools</source>
-        <translation>Outils</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
+        <source>Track layers readonly by default</source>
+        <translation>Couches de traces en lecture seule par défaut</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
-        <source>Name:</source>
-        <translation>Nom:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
+        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
+        <translation>Ne pas connecter les nœuds du GPX séparés par plus de (en km; 0 pour désactiver)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
-        <source>Path:</source>
-        <translation>Chemin:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
-        <source>Apply</source>
-        <translation>Appliquer</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
-        <source>Add</source>
-        <translation>Ajouter</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
-        <source>Remove</source>
-        <translation>Supprimer</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>Entrée GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Répertoire des styles personnalisés</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Modèkle de tag</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Série</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Modèle de tag Merkaartor (*.mat)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Mode de déplacement séparé</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Hôte</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
-        <source>Single mouse button interaction</source>
-        <translation>Interaction avec un seul bouton de souris</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
+        <source>Save NMEA log</source>
+        <translation>Sauver les fichiers de journalisation NMEA</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
-        <source>Use custom Qt style</source>
-        <translation>Utiliser un style Qt personnalisé</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation>Mettre l'horloge système à celle du GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
-        <source>Overwrite style</source>
-        <translation>Ecraser le style</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
-        <source>Pixels</source>
-        <translation>Pixels</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation>Configuration du Proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
-        <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation>Utiliser un serveur mandataire</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Mot-de-passe:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
-        <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Utilisateur:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
-        <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
-        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Nom d'hôte:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
-        <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
-        <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation>Activer le serveur local compatible JOSM sur le port 8111</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
-        <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation>Image d'arrière-plan</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
-        <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation>Mise en cache des tuiles (Inactif pour Yahoo! pour des raisons légales)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
-        <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation>Répertoire du cache</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Style actuel</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation>Taille du cache (en Mb; 0 pour désactiver)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Modèle</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation>Adapteur de carte</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
+        <source>Automatically add "source" tag when creating features over a background map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
-        <source>Track layers readonly by default</source>
-        <translation>Couches de traces en lecture seule par défaut</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
+        <source>Tools</source>
+        <translation>Outils</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
-        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation>Ne pas connecter les nœuds du GPX séparés par plus de (en km; 0 pour désactiver)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
+        <source>Name:</source>
+        <translation>Nom:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
+        <source>Path:</source>
+        <translation>Chemin:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
+        <source>Apply</source>
+        <translation>Appliquer</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
+        <source>Add</source>
+        <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Mise en cache des tuiles (Inactif pour Yahoo! pour des raisons légales)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
@@ -5809,7 +5813,7 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
         <source>Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
@@ -5817,6 +5821,11 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Tchèque</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Néérlandais</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
         <translation>Allemand</translation>
@@ -5847,6 +5856,11 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Polonais</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Portuguais</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
         <source>Brazilian Portuguese</source>
         <translation>Portugais Brésilien</translation>
@@ -5857,95 +5871,86 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Russe</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Utilisateur:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Surligner</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>Trace GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Slovaque</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Utiliser l'apparence simplifiée pour les traces GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Espagnol</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>Entrée GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Suédois</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>Ukrainien</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Série</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Modèle de tag Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Choisir une couleur</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Hôte</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>L'outil existe déjà</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Utiliser les nœuds virtuels (nouvelle session nécessaire)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Un outil portant ce nom existe déjà.
+Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vous désirer modifier celui existant</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Néérlandais</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Impossible de supprimer l'outil prédéfini</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Portuguais</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Impossible de supprimer l'outil prédéfini "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Slovaque</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Impossible de modifier le nom d'un outil prédéfini</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Espagnol</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Impossible de modifier le nom de l'outil prédéfini "%1"'</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Suédois</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Séléctionnez l'exécutable de l'outil</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>Ukrainien</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Relations sélectionnables quand cachées</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Interface</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Séléctionnez le dossier des fichiers de journalisation</translation>
     </message>
 </context>
 <context>
@@ -5998,7 +6003,7 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6019,40 +6024,40 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6066,10 +6071,19 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
 <context>
     <name>PropertiesDock</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
-        <source>Properties</source>
-        <translation>Propriétés</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
+        <source>%1/%1 selected item(s)</source>
+        <translation>%1/%1 élément(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
+        <source>%1/%2 selected item(s)</source>
+        <translation>%1/%2 élément(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
+        <source>Selected items</source>
+        <translation>Eléments sélectionnés</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
@@ -6077,9 +6091,9 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Propriétés - Eléments multiples</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
-        <source>Properties - Relation</source>
-        <translation>Propriétés - Relation</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Propriétés - Nœuds</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
@@ -6087,72 +6101,40 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Propriétés - Route</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
-        <source>Center map</source>
-        <translation>Centrer la carte</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
-        <source>Center && Zoom map</source>
-        <translation>Centrer && Zoomer la carte</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
-        <source>%1/%1 selected item(s)</source>
-        <translation>%1/%1 élément(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
-        <source>%1/%2 selected item(s)</source>
-        <translation>%1/%2 élément(s) sélectionné(s)</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
+        <source>Properties - Relation</source>
+        <translation>Propriétés - Relation</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
-        <source>Selected items</source>
-        <translation>Eléments sélectionnés</translation>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
+        <source>Properties</source>
+        <translation>Propriétés</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
+        <source>Center map</source>
+        <translation>Centrer la carte</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
+        <source>Center && Zoom map</source>
+        <translation>Centrer && Zoomer la carte</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
         <source>Select member</source>
         <translation>Selectionner le membre</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Propriétés - Nœuds</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Nettoyage en cascade</translation>
@@ -6178,7 +6160,30 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Déplacer le nœud %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Importer osmChange</translation>
     </message>
@@ -6188,31 +6193,31 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Importer NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importer NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6228,14 +6233,14 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6248,6 +6253,11 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>km/h</translation>
     </message>
     <message>
+        <location filename="../src/GPS/qgps.cpp" line="147"/>
+        <source>Unavailable</source>
+        <translation>Non disponible</translation>
+    </message>
+    <message>
         <location filename="../src/GPS/qgps.cpp" line="153"/>
         <source>2D</source>
         <translation>2D</translation>
@@ -6260,28 +6270,23 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
-    <message>
-        <location filename="../src/GPS/qgps.cpp" line="147"/>
-        <source>Unavailable</source>
-        <translation>Non disponible</translation>
-    </message>
 </context>
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Erreur de journalisation GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Impossible de créer le fichier de journalisation GPS: %1.</translation>
     </message>
@@ -6289,17 +6294,17 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>Impossible de se connecter à %1:%2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Erreur de journalisation GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Impossible de créer le fichier de journalisation GPS: %1.</translation>
     </message>
@@ -6385,95 +6390,139 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>Personalisation des barre d'outils</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation>Barre d'outils personnalisée</translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6488,7 +6537,15 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
@@ -6498,25 +6555,17 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
-        <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6544,17 +6593,17 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6598,19 +6647,19 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <translation>Nom</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Id</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6624,12 +6673,12 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
@@ -6653,6 +6702,16 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>Envoi à Openstreetmap</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation>Veuillez spécifier un commentaire pour ce changeset</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>Veuillez réviser avec précaution les changements envoyés vers OSM</translation>
@@ -6667,16 +6726,6 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Envoi à Openstreetmap</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Veuillez spécifier un commentaire pour ce changeset</translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
@@ -6720,7 +6769,7 @@ Veuillez choisir un autre nom ou cliquer sur le boutton <Appliquer> si vou
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6734,44 +6783,44 @@ p, li { white-space: pre-wrap; }
         <translation>Projection:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Lat/Lon (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>L'Origine est en bas à gauche</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Lat/Lon (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>L'Origine est en bas à gauche</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
@@ -6789,24 +6838,18 @@ p, li { white-space: pre-wrap; }
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>L'adresse et le chemin ne peuvent pas être vides.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Le téléchargement a échoué: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Erreur lors de la lecture des services.
@@ -6841,7 +6884,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
@@ -6851,7 +6894,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6861,12 +6904,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6890,27 +6933,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
@@ -6920,7 +6963,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
@@ -6930,71 +6973,71 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Extraction - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation>Nombre de Segments de trace</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Distance totale</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Durée totale</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Extraction - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Extraire une couche de dessin</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Faire un zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
@@ -7034,17 +7077,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7093,12 +7136,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Faire un zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
@@ -7106,35 +7149,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: Obtenir les capacités</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>L'adresse et le chemin ne peuvent pas être vides.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Le téléchargement a échoué: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Erreur durant la lecture des capacités.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>Configuration des serveurs WMS</translation>
@@ -7155,31 +7169,26 @@ p, li { white-space: pre-wrap; }
         <translation>Nom:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>Url du serveur:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>Couches:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>Projection:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>Format de l'image :</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Styles:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -7188,9 +7197,14 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Ceci est un serveur WMS-C (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;">  [...]
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>Projection:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
@@ -7198,14 +7212,24 @@ p, li { white-space: pre-wrap; }
         <translation>Niveaux de zoom</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation>Format de l'image :</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Styles:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7223,14 +7247,33 @@ p, li { white-space: pre-wrap; }
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>Url du serveur:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: Obtenir les capacités</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>L'adresse et le chemin ne peuvent pas être vides.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Erreur durant la lecture des capacités.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Le téléchargement a échoué: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_hr.ts b/translations/merkaartor_hr.ts
index 731212f..722c947 100644
--- a/translations/merkaartor_hr.ts
+++ b/translations/merkaartor_hr.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="hr">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,57 +24,57 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Copyright Bart Vanhauwaert, Chris Browet i drugi, 2006-2012</translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
         <translation>Ovaj pogram licenciran je pod GNU javnom licencom v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Promjene</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>U redu</translation>
     </message>
@@ -84,93 +82,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Prečac</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Uvoz</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Izvoz</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>Za&dana</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&U redu</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Odustani</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Urednik prečaca</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Učitaj sheme prečaca</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Merkaartor shema prečaca (*. MSS)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Ne mogu otvoriti datoteku</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 ne može biti otvoren</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Snimi shemu prečaca</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>bez naslova</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Sve datoteke (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Ne mogu snimiti datoteku</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 ne može biti otvoren za zapisivanje.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -214,26 +242,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform>Postoji <b>%n</b> prljavih objekata</numerusform>
-            <numerusform>Postoji <b>%n</b> prljavih objekata</numerusform>
-            <numerusform>Postoji <b>%n</b> prljavih objekata</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="195"/>
@@ -243,7 +267,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="196"/>
         <source>Center && Zoom map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -251,16 +275,16 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="14"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="37"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -271,9 +295,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -300,19 +324,19 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="350"/>
         <location filename="../src/Sync/DirtyList.cpp" line="701"/>
         <source>UPDATE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="358"/>
         <location filename="../src/Sync/DirtyList.cpp" line="639"/>
         <source>UPDATE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="366"/>
         <location filename="../src/Sync/DirtyList.cpp" line="670"/>
         <source>UPDATE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="374"/>
@@ -342,14 +366,14 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="424"/>
         <source>Please check your username and password in the Preferences menu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="427"/>
         <location filename="../src/Sync/DirtyList.cpp" line="447"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
@@ -361,7 +385,7 @@ API poruka je '%1'</translation>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="464"/>
         <source>Uploading changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="490"/>
@@ -386,13 +410,13 @@ API poruka je '%1'</translation>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="65"/>
         <source>Please check your username and password in the Preferences menu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="68"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="70"/>
@@ -406,7 +430,7 @@ API poruka je '%1'</translation>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
@@ -441,17 +465,17 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="399"/>
         <source>UPDATE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="414"/>
         <source>UPDATE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="428"/>
         <source>UPDATE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="442"/>
@@ -472,97 +496,97 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>bez naslova</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Prljavi sloj</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Pozadinske slike</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation>Crtaj sloj #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation>Filtriraj sloj #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>OSM izvoz</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Izvoz OSM ...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Dokument</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -590,12 +614,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -610,95 +634,88 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="119"/>
         <source>Resolve all relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Preuzimanje neuspješno</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
         <source>%1 download</source>
         <translation>%1 preuzimanje</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
         <source>Downloading unresolved...</source>
         <translation>Preuzimanje neriješenih ...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
         <source>Downloading unresolved %1 of %2</source>
         <translation>Preuzimanje neriješeni %1 od %2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
         <source>Parsing unresolved %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
         <source>Parsing...</source>
         <translation>Parsiranje...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
         <translation>Parsiram XML</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
         <translation>Sukobi iz %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
         <source>Empty roads/relations detected</source>
         <translation>Prazna cesta(e)/odnos(i) otkriven</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
         <source>Empty roads/relations are probably errors.
 Do you want to mark them for deletion?</source>
         <translation>Prazna cesta / odnosi vjerojatno su pogreške.
 Želite li ih označiti za brisanje?</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
         <source>Remove empty feature %1</source>
         <translation>Ukloni prazne značajke %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
         <translation>Primječeni su sukobi</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
         <source>Uploading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
@@ -708,117 +725,111 @@ Before being able to upload your changes, you will have to manually merge the tw
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
         <source>Waiting for server response</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
         <source>error</source>
         <translation>greška</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>nije preuzeto dovoljno</translation>
-    </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Preuzimam sa OSM-a (%n bajta)</numerusform>
-            <numerusform>Preuzimam sa OSM-a (%n bajta)</numerusform>
-            <numerusform>Preuzimam sa OSM-a (%n bajta)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Preuzimam sa OSM-a (%n kilobajta)</numerusform>
-            <numerusform>Preuzimam sa OSM-a (%n kilobajta)</numerusform>
-            <numerusform>Preuzimam sa OSM-a (%n kilobajta)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
         <source>Downloading...</source>
         <translation>Preuzimam...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
         <source>Downloading from OSM (connecting)</source>
         <translation>Preuzimam sa OSM-a (spajam se)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 API poruka je '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Preuzimanje neuspješno</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
         <source>Username/password invalid</source>
         <translation>Korisničko ime/zaporka nevažeće</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Unresolved conflicts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Please resolve existing conflicts first</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
         <source>Downloading trackpoints %1-%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
         <source>Downloaded track - nodes %1-%2</source>
         <translation>Preuzmite trag - čvorovi %1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
         <source>MapDust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
         <source>Downloading points</source>
         <translation>Preuzimam točke</translation>
     </message>
     <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
         <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
@@ -826,33 +837,33 @@ API poruka je '%1'</translation>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation>Ne mogu obrisati</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
         <translation>Ne mogu obrisati odabir jer je izvan preuzetog područja</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
         <translation>Ne mogu sve obrisati</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
         <translation>Preokreni put %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
         <translation>Preokreni %1 put</translation>
     </message>
@@ -867,7 +878,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="25"/>
         <source>What do you want to export?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="38"/>
@@ -900,7 +911,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="432"/>
         <source>Center && Zoom map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="433"/>
@@ -948,7 +959,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="72"/>
         <source>Only features fully within the viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
@@ -987,7 +998,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
@@ -1043,235 +1054,235 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
         <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
         <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
         <source>Please specify Walking Papers URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Geo slike</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
         <source>Center map</source>
         <translation>Centriraj kartu</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Ukloni slike</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Kopiraj datoteke u međuspremnik</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
         <translation>Odaberi slijedeću sliku</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
         <translation>PgDown</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
         <translation>Odaberi prethodnu sliku</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
         <translation>PgUp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
         <source>Save geotagged image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
         <source>Photo layer</source>
         <translation>Sloj fotografija</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Učitaj geo označene slike</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
         <translation>Sloj je samo čitljiv</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Učitaj slike...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Prekini učitavanje</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation>Ne postoji datoteka</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>Ne mogu pronaći sliku "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation>Greška prilikom otvaranja "%2":
 %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
         <translation>Greška prilikom učitavanja EXIF podataka iz datoteke "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>kraj traga</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>početak traga</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints found for image "%1"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'sekundi'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'minuta i' ss 'sekundi'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'sati,' mm 'minuta and' ss 'sekundi'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Slika "%1" je snimljena %2 prije što sljedeći TrackPoint zabilježen.
 Da li je i dalje želite koristiti?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Slika "%1" je snimljena %2 poslje što je zadnji TrackPoint zabilježen.
 Da li je i dalje želite koristiti?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>JPEG Images (*.jpg)</source>
         <translation>JPEG slike (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Greška prilikom otvaranja "%1":
@@ -1281,32 +1292,6 @@ Da li je i dalje želite koristiti?</translation>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Nevažeći OSM url</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Nevažeći format koordinata</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>idi na</translation>
@@ -1319,17 +1304,17 @@ Da li je i dalje želite koristiti?</translation>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1349,12 +1334,12 @@ Da li je i dalje želite koristiti?</translation>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="176"/>
         <source>OSM API Url</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="203"/>
         <source>OSM XAPI url</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="225"/>
@@ -1362,51 +1347,77 @@ Da li je i dalje želite koristiti?</translation>
         <source>Search</source>
         <translation>Traži</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Nevažeći OSM url</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Nevažeći format koordinata</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Nitijedan</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>Dodatci</translation>
     </message>
@@ -1414,71 +1425,71 @@ Da li je i dalje želite koristiti?</translation>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Karta - nitijedna</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Karta - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Karta - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Karta - WMS-Tiled - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Karta - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Karta - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation>Uvjeti licenciranja: %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation>Uvijeti licence nisu prihvačeni</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation>Poslužitelj</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Veličina pločice</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation>Minmalno/maksimalno povećanje</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Projekcija</translation>
     </message>
@@ -1486,105 +1497,6 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Niz</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Cijeli broj</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Plutajuće</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Dužina</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Širina</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Nevažeća projekcija</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Ne mogu postaviti projekciju</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Bez koordinata</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Polje dužina ili širine nedostaje. Biti će nemoguće uvesti datoteku.
-Želite li zaista izaći?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Učitaj CSV postavke uvoza</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Merkaartor postavke uvoza (*. MIS)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Nevažeća datoteka</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 ne može biti otvoren</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 nije datoteka sa postavkama za uvoz CSV datoteke</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>bez naslova</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Sve datoteke (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 ne može biti otvoren za zapisivanje.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dijalog</translation>
@@ -1599,7 +1511,7 @@ Do you really want to exit?</source>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1607,12 +1519,12 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
@@ -1642,7 +1554,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="138"/>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="145"/>
@@ -1652,7 +1564,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1662,7 +1574,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
@@ -1724,69 +1636,164 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Snimi postavke</translation>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Niz</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
-        <translation>Ne mogu postaviti projekciju; molim specificirajte</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Cijeli broj</translation>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
-        <translation>Informacije</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Plutajuće</translation>
     </message>
-</context>
-<context>
-    <name>Layer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
-        <translation>Veličina</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Dužina</translation>
     </message>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n značajke</numerusform>
-            <numerusform>%n značajke</numerusform>
-            <numerusform>%n značajke</numerusform>
-        </translation>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Širina</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
-        <translation>Značajke</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Nevažeća projekcija</translation>
     </message>
-</context>
-<context>
-    <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Ne mogu postaviti projekciju</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
-        <source>Hide All</source>
-        <translation>Sakrij sve</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Bez koordinata</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
-        <source>Readonly All</source>
-        <translation>Sve samo za čitanje</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Polje dužina ili širine nedostaje. Biti će nemoguće uvesti datoteku.
+Želite li zaista izaći?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Učitaj CSV postavke uvoza</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Merkaartor postavke uvoza (*. MIS)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Nevažeća datoteka</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 ne može biti otvoren</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 nije datoteka sa postavkama za uvoz CSV datoteke</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>bez naslova</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Sve datoteke (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 ne može biti otvoren za zapisivanje.</translation>
+    </message>
+</context>
+<context>
+    <name>ImportExportGdal</name>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation>Ne mogu postaviti projekciju; molim specificirajte</translation>
+    </message>
+</context>
+<context>
+    <name>InfoDock</name>
+    <message>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation>Informacije</translation>
+    </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation>Veličina</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
+        <translation>Značajke</translation>
+    </message>
+</context>
+<context>
+    <name>LayerDock</name>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
+        <source>Show All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
+        <source>Hide All</source>
+        <translation>Sakrij sve</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
+        <source>Readonly All</source>
+        <translation>Sve samo za čitanje</translation>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="260"/>
@@ -1821,72 +1828,72 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
         <source>Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Oblik</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation>Vidljiv</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation>Samo za čitanje</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Nisko</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Visoko</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Ne prozirno</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Prozirnost</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
         <translation>Zatvori sloj: Prčjavi objekti prisutni</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
         <translation>Zatvori sloj: nije prazan</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
         <translation>Da li ste sigurni da želite zatvoriti ovaj sloj? (nije moguće poništiti)</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Oblik</translation>
-    </message>
 </context>
 <context>
     <name>LicenseDisplayDialog</name>
@@ -1917,2623 +1924,2632 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Učitavanje dodataka...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Inicijalizacija...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Obriši %1 oznaku na %2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Obriši %1 oznake na %2</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Pomoć</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Ukloni člana '%1' na %2</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Stvori</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Cesta</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Uredi</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Pogled</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Stvori područje %1</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Oznake</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Područje: Napravi cestu %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Postavi &projekciju</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Dodaj rupu.</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Želite li dodati (još jednu) rupu na ovom području?</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Datoteka</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Područje: Završi cestu %1</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Izvoz</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Područje: Dodaj čvor %1 cesti %2</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Ne&davno otvoreni</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>Zatvori područje %1</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Nedavni &uvoz</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>Ala&ti</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Dodaj čvorove u cestu %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Stil</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Čvor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Stvori čvor na cesti: %1</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Prozor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Napravite POI %1</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Dok</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Značajke</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Stvori poligon %1</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Slojevi</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Stvori kružni tok %1</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&acija</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>P&okaži</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Stvori čvor %1 na cesti %2</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Stvori cestu: %1</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Glavna alatna traka</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Stvori čvor: %1</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Izlaz</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Dodaj čvor %1 cesti %2</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&O programu</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Zatvori cestu %1</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Otvori</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Napravite novi dokument i uvezite datoteku</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Uredi interakciju</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Ukloni značajke %1</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation>Ukloni značajke</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Obriši djecu</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>Želite li izbrisati čvorove djecu također?
-Imajte na umu da će OSM čvorovi izvan preuzetog područja biti zadržani.</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation>Preokreni %1 put</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation>Istisni cestu %1</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>Lijevom tipkom miša za odabir; Povucite lijevo za pomicanje</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Interakcija pomakni čvor</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Povečaj</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Pomakni čvor</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Pomakni čvor %1</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Zakrivljeni link</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Poništi</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Spajanje Čvorovi u %1</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Ponovo uradi</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation>Zadržite pokazivač za odabir; Povucite lijevo za rotiranje</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Pomakni</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation>Zadržite pokazivač za odabir; Povucite ljevo za promjenu veličine</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Uvoz</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Uvezi datoteku u trenutni dokument</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Preuzmi</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>Lijevom tipkom miša do prvog ugla -> povucite lijevo da bi odredili područje -> lijevom tipkom miša za uvećanje</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Preuzimanje podataka karte za novo područje</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>pločica %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Poveznica</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Svojstva...</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Stvori vezu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Ne mogu učitati datoteku sa projekcijama</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>Nemoguće je otvoriti "Projections.xml". Prekidam.</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Odaberi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Nisko</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Visoko</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Učitaj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Ne prozirno</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>Datoteka</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Uredi</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>&Ukloni</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>Pogled</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Ukloni odabrane značajke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>Prikaži</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Izbriši</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Usmjerene strelice</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Stvori novu cestu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Slojevi</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Stvori novi čvor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Stvori</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Značajka</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Preokreni</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Prekreni smjer ceste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Čvor</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Idi na...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Put</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relacija</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Cesta sa odvojenim trakama</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>GPS Exchange format (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>OpenStreetMap format (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Stvori kružni tok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Novi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>NMEA GPS log format (*. NMEA *. NMA)
-</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Stvori novi dokument</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>KML datoteke (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Razdvoji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Odvojeno zarezom (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Geooznačene slike (*. jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>ESRI Shapefile (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Spoji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation>Geography Markup Language (*.gml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Spoji spojene ceste u jednu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Merkaartorov dokument (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Prelomiti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Cesta</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Prelomi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Učitaj sliku</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Razdvoji povezane ceste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Dodaj pozicijski čvor slici</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Geooznači sliku sa ovom pozicijom</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&lacija</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Odustani</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Stvori relaciju</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Alati</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Područje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation>Prozori</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Stvori novo područje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Pomoć</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Uredi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation>Izreži značajke</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Snimi k&ao</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Međuspremnik nevažeći</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Učitaj...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Međuspremnik ne sadrži ispravne podatke</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Zakrivljena cesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Postavke...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Svi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Izvoz svih vidljivih slojeva u datoteku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Nađi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Traži</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Pronađite i odaberite stavke</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Pogled...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Izvoz značajki unutar pogleda u datoteku</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Dodaj...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Ukloni...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Spoji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Upozorenje o autorskom pravu</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Spoji čvor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Spoji odabrane čvorove (prvi odabrani će ostati)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Nije valjana datoteka</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 ne može biti otvoren</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Snimi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Snimi u datoteku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Otvori datoteke</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Preuzmi više</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Preuzimanje više podataka karte za tekuće područje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Preuzmite trenutni prikaz na prethodni sloj preuzimanja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Značajke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Greška prilikom preuzimanja</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Sakrij/prikaži dok značajki</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Greška prilikom preuzimanja OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Sakrij/prikaži dok slojeva</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Informacije</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Sakrij/prikaži Info dok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Stvori poligon</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Poravnaj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Spoji ceste</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Poravnaj čvorove</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Razdvoji ceste</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Poravnaj odabrane čvorove. Prva dva odabrana određuju liniju.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Prelomi cestu</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Pojednostavi ceste</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>&Raširi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Prisilno učitavanje značajke</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Poravnaj i rasporedi odabrane čvorove jednoliko.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Ne mogu kontaktirati OpenStreetBugs.</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Sakrij/prikaži dok poništavanja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Greška prilikom zatvaranja greške</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Ne mogu obrisati bug. Poslužiteljska poruka je:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Stvori spoj</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Višestruko raskrižje.</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Kopiraj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Kopiraj odabrane značajke i oznake u međuspremnik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Dodaj kućne brojeve</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation>Poravnaj s osima</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>trokutno</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Zaljepi oznake</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>okomito</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>peterokutno</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Spoji oznake u međuspremniku s onima odabranih značajki.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>šesterokutno</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>sedmerokutno</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Odabrani...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>osmerokutni</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>Poravnaj na %1 os(i)</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Zalijepi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>Poravnajte na %1 redovitih osi</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>Poravnjavanje na osi nije uspjelo. Molimo vas da podesite oštre kutove i pokušate ponovno.</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>Poravnjavanje na osi nije uspjelo i nije pronašlo rješenje.</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (binarni)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Poravnaj čvorove</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Prisilno učitavanje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Pošalji značajku u prljavi sloj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Odvoji čvor %1</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Dodaj član relaciji</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>Spoji područja</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Sakrij/prikaži alatnu traku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Razdvoji područje</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Sakrij sve</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Stvori relaciju %1</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Snimi stil karte</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>&Slikovni sloj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Merkaartor stil karte (*. mas)</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Učitaj stil karte</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Podržani formati</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Prikaži i&mena</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Merkaartor stil karte (*. mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Početak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Pokreni GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Snimi Merkaartorov dokument</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Ponovi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>bez naslova</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Merkaartor dokumenti datoteke (*. MDC)</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Sve datoteke (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Sakrij/prikaži GPS, dok,</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation>Snimi Merkaartorov predložak</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>S&tani</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Ne mogu snimiti datoteku</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Zaustavi GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 ne može biti otvoren za zapisivanje.</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centrirati na GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Nevažeća datoteka</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 nije valjan Merkaator dokument.</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>izvoz OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>OSM datoteke (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Izvoz osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>osmChange datoteke (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Izvoz GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPX datoteke (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Izvoz KML</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Snimaj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KML datoteke (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Snimaj GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pauza</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Pauziraj GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoSlika</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Sakrij/prikaži GeoImage dok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Dodaj oznaku</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Nevažeća oznaka</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Urednik prečaca...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Oznaka ne može biti prazna</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Spoji...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Snimi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Unesite novi, zadrži isti za prepisati ili otkazati.</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Dodaj člana</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>kloni oznaku</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Ukloni člana</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Odaberi oznaku za uklanjanje</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Nikada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Nevažeća projekcija</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>za &jednosmjerne ceste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Ne mogu postaviti projekciju "%1".</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Uvijek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>GPS greška</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>O&dvoji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Odvoji čvor iz ceste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Odvoji čvor iz ceste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Izvanmrežni rad</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Merkaartor predložšci oznaka (*.mat)</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Stilovi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Sakrij/prikaži dok stilova</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Pomoć</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>&Urednik WMS poslužitelja...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Stvori</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>&Urednik TMS poslužitelja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Cesta</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Poništi stanja odbacivih dijaloga</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Uredi</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>GPS Izbornik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Pogled</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Kamera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Oznake</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Stvori &spoj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Postavi &projekciju</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Rotiraj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Datoteka</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Izvoz</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Ne&davno otvoreni</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Nedavni &uvoz</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Značajke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>Ala&ti</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Dodaj kućne brojeve (Karlsruhe shema)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Stil</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Podjeli dalje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Čvor</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Prozor</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Dok</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Značajke</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>&Zaključaj povečanje prema pozadini</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Slojevi</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>&Urednik projekcija...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&acija</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>P&okaži</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Prisilno obriši</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>Glavna alatna traka</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Izlaz</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>Pojednostav&i</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&O programu</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Pojednostavi cestu(e)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Otvori</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Napravite novi dokument i uvezite datoteku</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>&Urednik filtara</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>&Nijedan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation>&Spoji područja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation>Spoji područja koja se dodiruju</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation>Spoji područja koja se dodiruju</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>&Razdvoji područje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>&Terasa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Povečaj</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Zakrivljeni link</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation>&Poravnaj s osima</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Poništi</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation>Poravnaj rubuve na regularne osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation>Poravnaj rubove na određen broj ravnomjerno razmaknutih osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Ponovo uradi</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>&Ispiši...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Pomakni</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Svojstva...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation>Označi prljave značajke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Uvoz</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Uvezi datoteku u trenutni dokument</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation>&Izreži</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Preuzmi</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Preuzimanje podataka karte za novo područje</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation>Izvuci</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Poveznica</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation>Interakcija istiskivanja za puteve (JOSM stil)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Stvori vezu</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Odaberi</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation>Uključi djecu u odabir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Učitaj</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>&Ukloni</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Ukloni odabrane značajke</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Izbriši</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Stvori novu cestu</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Stvori novi čvor</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Preokreni</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Preuzmi djecu koja nedostaju</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Prekreni smjer ceste</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Idi na...</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Obriši %1 oznaku na %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Cesta sa odvojenim trakama</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Obriši %1 oznake na %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Stvori kružni tok</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Ukloni člana '%1' na %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Novi</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Stvori novi dokument</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Razdvoji</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Stvori čvor na cesti: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Spoji</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Stvori područje %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Spoji spojene ceste u jednu</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Područje: Napravi cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Dodaj rupu.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Prelomiti</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Želite li dodati (još jednu) rupu na ovom području?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Prelomi</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Područje: Završi cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Razdvoji povezane ceste</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Područje: Dodaj čvor %1 cesti %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Zatvori područje %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&lacija</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Stvori relaciju</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Dodaj čvorove u cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Područje</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Stvori novo područje</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Napravite POI %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Uredi...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Snimi...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Učitaj...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Stvori poligon %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Zakrivljena cesta</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Stvori kružni tok %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Postavke...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Svi...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Stvori čvor %1 na cesti %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Izvoz svih vidljivih slojeva u datoteku</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Stvori cestu: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Nađi...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Stvori čvor: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Traži</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Dodaj čvor %1 cesti %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Pronađite i odaberite stavke</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Zatvori cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Pogled...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Izvoz značajki unutar pogleda u datoteku</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Dodaj...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Uredi interakciju</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Ukloni...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Ukloni značajke %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Spoji</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>Ukloni značajke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Spoji čvor</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Obriši djecu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Spoji odabrane čvorove (prvi odabrani će ostati)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>Želite li izbrisati čvorove djecu također?
+Imajte na umu da će OSM čvorovi izvan preuzetog područja biti zadržani.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>Preokreni %1 put</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Snimi k&ao</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation>Istisni cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Snimi</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>Lijevom tipkom miša za odabir; Povucite lijevo za pomicanje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Snimi u datoteku</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Interakcija pomakni čvor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Pomakni čvor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Preuzmi više</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Pomakni čvor %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Preuzimanje više podataka karte za tekuće područje</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Preuzmite trenutni prikaz na prethodni sloj preuzimanja</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Spajanje Čvorovi u %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Značajke</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation>Zadržite pokazivač za odabir; Povucite lijevo za rotiranje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Sakrij/prikaži dok značajki</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Sakrij/prikaži dok slojeva</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation>Zadržite pokazivač za odabir; Povucite ljevo za promjenu veličine</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informacije</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Sakrij/prikaži Info dok</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>Lijevom tipkom miša do prvog ugla -> povucite lijevo da bi odredili područje -> lijevom tipkom miša za uvećanje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Poravnaj</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>GPS Exchange format (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Poravnaj čvorove</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>OpenStreetMap format (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Poravnaj odabrane čvorove. Prva dva odabrana određuju liniju.</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>&Raširi</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>NMEA GPS log format (*. NMEA *. NMA)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>KML datoteke (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Poravnaj i rasporedi odabrane čvorove jednoliko.</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Odvojeno zarezom (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Sakrij/prikaži dok poništavanja</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Geooznačene slike (*. jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>ESRI Shapefile (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation>Geography Markup Language (*.gml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopiraj</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Podržani formati</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Kopiraj odabrane značajke i oznake u međuspremnik</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Merkaartorov dokument (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Sve datoteke (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>pločica %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Ne mogu učitati datoteku sa projekcijama</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>Nemoguće je otvoriti "Projections.xml". Prekidam.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Nisko</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Visoko</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Zaljepi oznake</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Ne prozirno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Značajka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Spoji oznake u međuspremniku s onima odabranih značajki.</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Čvor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Odabrani...</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relacija</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Učitaj sliku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Zalijepi</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Dodaj pozicijski čvor slici</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Geooznači sliku sa ovom pozicijom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Odustani</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>Datoteka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Uredi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (binarni)</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Pogled</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Prisilno učitavanje</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Prikaži</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Pošalji značajku u prljavi sloj</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Usmjerene strelice</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Slojevi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Stvori</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Put</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Sakrij/prikaži alatnu traku</translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Alati</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Sakrij sve</translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation>Prozori</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Pomoć</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation>Izreži značajke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>&Slikovni sloj</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Međuspremnik nevažeći</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Međuspremnik ne sadrži ispravne podatke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Prikaži i&mena</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Početak</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Pokreni GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Ponovi...</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Upozorenje o autorskom pravu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Sakrij/prikaži GPS, dok,</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Nije valjana datoteka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 ne može biti otvoren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>S&tani</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Zaustavi GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centrirati na GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Otvori datoteke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Greška prilikom preuzimanja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Greška prilikom preuzimanja OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Snimaj</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Snimaj GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pauza</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Pauziraj GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Stvori poligon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eoSlika</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Sakrij/prikaži GeoImage dok</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Spoji ceste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Razdvoji ceste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Prelomi cestu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Urednik prečaca...</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Pojednostavi ceste</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Spoji...</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Prisilno učitavanje značajke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Dodaj člana</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Ukloni člana</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Ne mogu kontaktirati OpenStreetBugs.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nikada</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Greška prilikom zatvaranja greške</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>za &jednosmjerne ceste</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Ne mogu obrisati bug. Poslužiteljska poruka je:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Uvijek</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Stvori spoj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>O&dvoji</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Višestruko raskrižje.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Odvoji čvor iz ceste</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Odvoji čvor iz ceste</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Dodaj kućne brojeve</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Izvanmrežni rad</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Stilovi</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Sakrij/prikaži dok stilova</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation>Poravnaj s osima</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>&Urednik WMS poslužitelja...</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>trokutno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>&Urednik TMS poslužitelja</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>okomito</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Poništi stanja odbacivih dijaloga</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>peterokutno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>GPS Izbornik</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>šesterokutno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>sedmerokutno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Stvori &spoj</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>osmerokutni</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Rotiraj</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>Poravnaj na %1 os(i)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>Poravnajte na %1 redovitih osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>Poravnjavanje na osi nije uspjelo. Molimo vas da podesite oštre kutove i pokušate ponovno.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>Poravnjavanje na osi nije uspjelo i nije pronašlo rješenje.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Poravnaj čvorove</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Odvoji čvor %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Dodaj član relaciji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Spoji područja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Razdvoji područje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Stvori relaciju %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Snimi stil karte</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Preuzmi djecu koja nedostaju</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Merkaartor stil karte (*. mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Značajke</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Učitaj stil karte</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Dodaj kućne brojeve (Karlsruhe shema)</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Merkaartor stil karte (*. mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Podjeli dalje</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>bez naslova</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Snimi Merkaartorov dokument</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>&Zaključaj povečanje prema pozadini</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Merkaartor dokumenti datoteke (*. MDC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>&Urednik projekcija...</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation>Snimi Merkaartorov predložak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Ne mogu snimiti datoteku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 ne može biti otvoren za zapisivanje.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Prisilno obriši</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Zatvori</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Nevažeća datoteka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>Pojednostav&i</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 nije valjan Merkaator dokument.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Pojednostavi cestu(e)</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>izvoz OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>OSM datoteke (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>&Urednik filtara</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Izvoz osmChange</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>&Nijedan</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>osmChange datoteke (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation>&Spoji područja</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Izvoz GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation>Spoji područja koja se dodiruju</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPX datoteke (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation>Spoji područja koja se dodiruju</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Izvoz KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>&Razdvoji područje</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KML datoteke (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>&Terasa</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Dodaj oznaku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation>&Poravnaj s osima</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Nevažeća oznaka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation>Poravnaj rubuve na regularne osi</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Oznaka ne može biti prazna</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation>Poravnaj rubove na određen broj ravnomjerno razmaknutih osi</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>&Ispiši...</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Unesite novi, zadrži isti za prepisati ili otkazati.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>kloni oznaku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation>Označi prljave značajke</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Odaberi oznaku za uklanjanje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation>&Izreži</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Nevažeća projekcija</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Ne mogu postaviti projekciju "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation>Izvuci</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>GPS greška</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation>Interakcija istiskivanja za puteve (JOSM stil)</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation>Alt+X</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation>Uključi djecu u odabir</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Merkaartor predložšci oznaka (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Unresolved conflicts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Please resolve existing conflicts first</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
         <source>It is strongly recommended to save the changes to your document after an upload.
 Do you want to do this now?</source>
         <translation>Preporučeno ja da snimite promjene nakon učitavanja.
@@ -4543,189 +4559,189 @@ Do you want to do this now?</source>
         <location filename="../src/common/TagModel.cpp" line="131"/>
         <location filename="../src/common/TagModel.cpp" line="162"/>
         <source>Set Tags on multiple features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="133"/>
         <location filename="../src/common/TagModel.cpp" line="164"/>
         <source>Set Tags on %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>posljednji: </i><b>%1</b&gt; by <b>%2</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation><i>posljednji: </i><b>%1</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
         <translation><br/><i>sloj: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
         <source>Waypoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
         <source>coord</source>
         <translation>koordinata</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>nadmorska visina</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>brzina</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
         <source>description</source>
         <translation>opis</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
         <source>comment</source>
         <translation>komentar</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
         <source>Node</source>
         <translation>Čvor</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>nadmorska visina</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>brzina</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>veličina</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>članovi</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>Gornji lijevi</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>Donje desno</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Relacija</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Uloga</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Član</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
         <translation>Zatvorena cesta</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Dužina</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Veličina</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>%1 čvorova</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>Područje</translation>
     </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Put</translation>
-    </message>
-</context>
-<context>
-    <name>MapView</name>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Put</translation>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
         <translation>Granično područje</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Projekcija</translation>
     </message>
@@ -4739,22 +4755,32 @@ Do you want to do this now?</source>
         <translation>Nova oznaka</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Dvostruki ključ</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Više od 150 postavke</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
         <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
         <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
@@ -4773,7 +4799,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="33"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="53"/>
@@ -4789,19 +4815,19 @@ Do you want to do this now?</source>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Klasa</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Naziv</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4812,25 +4838,10 @@ Do you want to do this now?</source>
         <translation>Greška!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Domaćin usluge tražila imena nije pronađen.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Domaćin usluge tražila imena odbio vezu.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Usluga tražila imena zahtijeva provjeru autentičnosti.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Nepoznata greška</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4847,7 +4858,7 @@ Do you want to do this now?</source>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>Output filename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
@@ -4914,17 +4925,17 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
         <source>Show Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
@@ -4968,31 +4979,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Uvijek</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Odaberi boju</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Urednik stila karte</translation>
@@ -5025,6 +5017,31 @@ Do you want to do this now?</source>
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Proporcionalna debljina</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>Nepromjenljive debljine</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
         <translation>Filter</translation>
@@ -5047,7 +5064,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
         <source>Tag selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
@@ -5063,7 +5080,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
         <source>Visible from scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5073,31 +5090,6 @@ Do you want to do this now?</source>
         <translation>Crtaj obojano</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Proporcionalna debljina</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>Nepromjenljive debljine</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5127,17 +5119,17 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
         <source>Touchup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="981"/>
@@ -5152,7 +5144,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5189,259 +5181,108 @@ Do you want to do this now?</source>
         <source>Label with background tag</source>
         <translation>Naljepnica s oznakom pozadine</translation>
     </message>
-</context>
-<context>
-    <name>PhotoLoadErrorDialog</name>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
-        <source>No Valid geotag</source>
-        <translation>Nema važeču geooznaku</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
-        <source>This photo does not contain geo-tagging EXIF data.
-What do you want to do next?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
-        <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
-        <source>Load without associated node</source>
-        <translation>Učitaj bez pridruženog čvora</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
-        <source>Extract info from barcode (Walking Papers)</source>
-        <translation>Ekstrakt infoa iz barkoda (Walking Papers)</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
-        <source>Ignore it</source>
-        <translation>Ignoriraj</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
-        <source>Do this for all current photos.</source>
-        <translation>Učinite to za sve trenutne slike.</translation>
-    </message>
-</context>
-<context>
-    <name>PictureViewerDialog</name>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>untitled</source>
-        <translation>bez naslova</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVG datoteke (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Sve datoteke (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation>Slikovne datoteke (*.png *.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Dijalog</translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>Engleski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Arapski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Češki</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Nizozemski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>Njemači</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>Francuski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation>Mađarski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Talijanski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation>Japanski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation>Poljski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Portugalski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Brazilski portugalski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Ruski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Slovački</translation>
-    </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Španjolski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Švedski</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Uvijek</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>Ukrajinski</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Odaberi boju</translation>
     </message>
+</context>
+<context>
+    <name>PhotoLoadErrorDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Direktorij prilagođenih stilova</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
+        <source>No Valid geotag</source>
+        <translation>Nema važeču geooznaku</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartor predložak oznaka (*.mat)</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
+        <source>This photo does not contain geo-tagging EXIF data.
+What do you want to do next?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Odaberi boju</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
+        <source>Try to match with a track node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Alat već postoji</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
+        <source>Load without associated node</source>
+        <translation>Učitaj bez pridruženog čvora</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Alat ovakvog naziva već postoji.
-Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite izmjeniti postojeći.</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
+        <source>Extract info from barcode (Walking Papers)</source>
+        <translation>Ekstrakt infoa iz barkoda (Walking Papers)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Ne mogu obrisati unaprijed definiran alat</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
+        <source>Ignore it</source>
+        <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Ne mogu obrisati unaprijed definiran alat "%1"</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
+        <source>Do this for all current photos.</source>
+        <translation>Učinite to za sve trenutne slike.</translation>
     </message>
+</context>
+<context>
+    <name>PictureViewerDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Ne mogu promjeniti ime unaprijed definiranog alata</translation>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dijalog</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Ne mogu promjeniti ime unaprijed definiranog alata "%1"'</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>untitled</source>
+        <translation>bez naslova</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation>Odaberi predložak</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>SVG datoteke (*.svg)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation>Merkaartorov dokument (*.mdc)</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>Sve datoteke (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation>Slikovne datoteke (*.png *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
         <source>Preferences</source>
@@ -5450,7 +5291,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
         <source>Visual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
@@ -5460,7 +5301,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
         <source>Zoom Out/in (%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
@@ -5470,12 +5311,12 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
         <source>Use custom Qt style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
@@ -5485,17 +5326,17 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
         <source>Separate Move mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
         <source>Use Virtual nodes (new session required)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
         <source>Relations selectable while hidden</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
@@ -5526,7 +5367,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
         <source>Overwrite style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
@@ -5546,7 +5387,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
         <source>Use simple GPX track appearance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
@@ -5586,7 +5427,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
         <source>You may need to restart the program for these changes to take effect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
@@ -5596,12 +5437,12 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
         <source>Translate standard tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
@@ -5611,42 +5452,42 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
@@ -5654,6 +5495,12 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <translation>Stil karte</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Direktorij prilagođenih stilova</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
         <source>Current style</source>
         <translation>Trenutni stil</translation>
@@ -5669,6 +5516,12 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <translation>Predložak</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
         <source>Built-in</source>
         <translation>Ugrađen</translation>
@@ -5686,7 +5539,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
@@ -5702,7 +5555,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
@@ -5722,17 +5575,17 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
         <source>Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
         <source>Automatically extract tracks on open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
         <source>Track layers readonly by default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
@@ -5742,12 +5595,12 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5773,7 +5626,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
@@ -5786,114 +5639,266 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <translation>Snimi NMEA log</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation>Mreža:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation>Postavke proxyija</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation>Koristi proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Zaporka:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Korisnik:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Host:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation>Omogući JOSM kompatibilni lokalni web poslužitelja na portu 8111</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation>Pozadinska slika</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation>Direktorij međuspremnika</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation>Veličina međuspremnika (u Mb; 0 za onemogućiti)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation>Adapter karte</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
+        <source>Automatically add "source" tag when creating features over a background map</source>
+        <translation>Automatski dodaj "source" oznaku prilikom kreiranja značajki preko pozadinske karte</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
+        <source>Tools</source>
+        <translation>Alati</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
+        <source>Name:</source>
+        <translation>Naziv:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
+        <source>Path:</source>
+        <translation>Putanja;</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
+        <source>Apply</source>
+        <translation>Primjeni</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
+        <source>Add</source>
+        <translation>Dodaj</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
+        <source>Remove</source>
+        <translation>Ukloni</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>Engleski</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Arapski</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Češki</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Nizozemski</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>Njemači</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>Francuski</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation>Mađarski</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Talijanski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Mreža:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation>Japanski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Postavke proxyija</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation>Poljski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Koristi proxy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Portugalski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Zaporka:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>Brazilski portugalski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Korisnik:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Ruski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Slovački</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Host:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Španjolski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Švedski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>Omogući JOSM kompatibilni lokalni web poslužitelja na portu 8111</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>Ukrajinski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Pozadinska slika</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartor predložak oznaka (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Odaberi boju</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
-        <translation>Direktorij međuspremnika</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Alat već postoji</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Veličina međuspremnika (u Mb; 0 za onemogućiti)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Alat ovakvog naziva već postoji.
+Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite izmjeniti postojeći.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
-        <translation>Adapter karte</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Ne mogu obrisati unaprijed definiran alat</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
-        <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation>Automatski dodaj "source" oznaku prilikom kreiranja značajki preko pozadinske karte</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Ne mogu obrisati unaprijed definiran alat "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
-        <source>Tools</source>
-        <translation>Alati</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Ne mogu promjeniti ime unaprijed definiranog alata</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
-        <source>Name:</source>
-        <translation>Naziv:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Ne mogu promjeniti ime unaprijed definiranog alata "%1"'</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
-        <source>Path:</source>
-        <translation>Putanja;</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
-        <source>Apply</source>
-        <translation>Primjeni</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation>Odaberi predložak</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
-        <source>Add</source>
-        <translation>Dodaj</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation>Merkaartorov dokument (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
-        <source>Remove</source>
-        <translation>Ukloni</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5946,7 +5951,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5967,12 +5972,12 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
@@ -5982,25 +5987,25 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6067,7 +6072,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
         <source>Center && Zoom map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
@@ -6078,29 +6083,6 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation>Izvoz GPX ...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Odustani</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation>Uvoz ...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Kaskadno čišćenje</translation>
@@ -6110,7 +6092,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <location filename="../src/Commands/FeatureCommands.cpp" line="74"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="188"/>
         <source>Set Tag '%1=%2' on %3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="314"/>
@@ -6126,7 +6108,30 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <translation>Pomakni čvor %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation>Izvoz GPX ...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Odustani</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation>Uvoz ...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Uvezi osmChange</translation>
     </message>
@@ -6136,31 +6141,31 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <translation>Uvoz NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Uvoz NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6176,14 +6181,14 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6213,7 +6218,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6224,32 +6229,32 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>GPS log pogreški</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>GPS log pogreški</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6263,7 +6268,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="22"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="29"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="63"/>
@@ -6327,101 +6332,145 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/NameFinder/xmlstreamreader.cpp" line="45"/>
         <source>Not a proper results stream!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< R A S T A V LJ A Č ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>Prilagođavanje alatne trake</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Akcije</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Novi</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Ukloni</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>U redu</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Primjeni</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Odustani</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>Gore</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation>Dolje</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< R A S T A V LJ A Č ></translation>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation>Korisnička alatna traka</translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6449,7 +6498,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
@@ -6464,7 +6513,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6487,7 +6536,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="61"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
@@ -6502,7 +6551,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6558,7 +6607,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6566,18 +6615,18 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="277"/>
         <source>Reset view</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
@@ -6603,7 +6652,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
         <source>Upload to Openstreetmap</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
@@ -6613,7 +6662,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="66"/>
@@ -6629,33 +6678,9 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
 <context>
     <name>TMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
-        <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adresa i staze ne mogu biti prazni</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Preuzimanje neuspješno: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
-        <source>Error reading services.
-</source>
-        <translation>Pogreška pri čitanju usluge.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
         <source>TMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="20"/>
@@ -6675,7 +6700,7 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="99"/>
         <source>Server Url:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="111"/>
@@ -6692,9 +6717,9 @@ Molim odaberite drugi naziv te odaberite <Primjeni> dugme ukoliko želite
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
@@ -6714,7 +6739,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
         <source>Origin is bottom-left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
@@ -6729,7 +6754,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
@@ -6756,6 +6781,24 @@ p, li { white-space: pre-wrap; }
         <source>Remove</source>
         <translation>Ukloni</translation>
     </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
+        <source>Merkaartor: GetServices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Adresa i staze ne mogu biti prazni</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
+        <source>Error reading services.
+</source>
+        <translation>Pogreška pri čitanju usluge.
+</translation>
+    </message>
 </context>
 <context>
     <name>TagModel</name>
@@ -6772,7 +6815,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TagModel.h" line="22"/>
         <source>Edit this to add...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6884,43 +6927,43 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
         <source>Extract - %1</source>
         <translation>Ekstrakt - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation># od djelova traga</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Ukupna udaljenost</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Ukupno trajanje</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
@@ -6928,17 +6971,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Ekstrakt crtanog sloja</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
@@ -6948,7 +6991,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="14"/>
         <source>Trackpoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="34"/>
@@ -6973,7 +7016,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="81"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
@@ -6988,7 +7031,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7006,7 +7049,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="36"/>
         <source>Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="49"/>
@@ -7026,7 +7069,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="88"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="104"/>
@@ -7037,12 +7080,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Očisti</translation>
     </message>
@@ -7050,38 +7093,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adresa i staze ne mogu biti prazni</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Pogreška pri čitanju sposobnosti.
-</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Preuzimanje neuspješno: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="20"/>
@@ -7101,7 +7115,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
         <source>Server Url:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
@@ -7118,9 +7132,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
@@ -7130,7 +7144,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
@@ -7172,5 +7186,34 @@ p, li { white-space: pre-wrap; }
         <source>Remove</source>
         <translation>Ukloni</translation>
     </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Adresa i staze ne mogu biti prazni</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Pogreška pri čitanju sposobnosti.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Preuzimanje neuspješno: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_hu.ts b/translations/merkaartor_hu.ts
index abea1cd..41acb6c 100644
--- a/translations/merkaartor_hu.ts
+++ b/translations/merkaartor_hu.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="hu_HU">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -9,38 +7,14 @@
         <translation>Merkaartor névjegye</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>E program a GNU GPLv2 engedéllyel jár</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
-    </message>
-    <message>
         <location filename="../src/common/AboutDialog.ui" line="30"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -50,127 +24,181 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>E program a GNU GPLv2 engedéllyel jár</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Szerzői jog: Bart Vanhauwaert, Chris Browet és mások, 2006-2012</translation>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Változások</translation>
     </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
 </context>
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Jellemzés</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Gyorsgomb</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Behoz</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Kivisz</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Alap</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Mégsem</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Gyorsgombszerkesztő</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Gyorsgombbeállítások behozatala</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Merkaartor-gyorsgombbeállítás (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Nem tudom a fájlt megnyitni</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 fájlt nem tudtam megnyitni.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Gyorsgombbeállítások kivitele</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>nevenincs</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Nem tudom megnyitni a mentésfájlt</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>Nem tudtam %1 fájlt írásra megnyitni.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -214,19 +242,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -247,29 +273,29 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyDockWidget</name>
     <message>
+        <location filename="../src/Docks/DirtyDock.ui" line="14"/>
+        <source>Undo</source>
+        <translation>Vissza</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/DirtyDock.ui" line="37"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
         <source>Cleanup</source>
         <translation>Kitakarít</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/DirtyDock.ui" line="14"/>
-        <source>Undo</source>
-        <translation>Vissza</translation>
-    </message>
 </context>
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Nagyít</translation>
     </message>
@@ -277,21 +303,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyListExecutor</name>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="423"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="430"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="446"/>
-        <source>Error uploading request</source>
-        <translation>Hiba a kérést feltöltvén</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="427"/>
-        <location filename="../src/Sync/DirtyList.cpp" line="447"/>
-        <source>There was an error uploading this request (%1)
-Server message is '%2'</source>
-        <translation>E kérést feltöltvén hiba (%1) történt
-A szolgáló üzenete: „%2”</translation>
-    </message>
-    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="326"/>
         <location filename="../src/Sync/DirtyList.cpp" line="570"/>
         <source>ADD road %1</source>
@@ -346,19 +357,24 @@ A szolgáló üzenete: „%2”</translation>
         <translation>ELTÁVOLÍTja %1 kapcsolatot</translation>
     </message>
     <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="423"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="430"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="446"/>
+        <source>Error uploading request</source>
+        <translation>Hiba a kérést feltöltvén</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="424"/>
         <source>Please check your username and password in the Preferences menu</source>
         <translation>Kérem ellenőrizze nevét és jelszavát a Beállításokban</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
-        <source>OPEN changeset</source>
-        <translation>MEGNYITja a változásokat</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
-        <source>CLOSE changeset</source>
-        <translation>LEZÁRja a változásokat</translation>
+        <location filename="../src/Sync/DirtyList.cpp" line="427"/>
+        <location filename="../src/Sync/DirtyList.cpp" line="447"/>
+        <source>There was an error uploading this request (%1)
+Server message is '%2'</source>
+        <translation>E kérést feltöltvén hiba (%1) történt
+A szolgáló üzenete: „%2”</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
@@ -372,6 +388,16 @@ Az API-üzenete: „%1”</translation>
         <source>Uploading changes...</source>
         <translation>Feltöltöm a változásokat…</translation>
     </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
+        <source>OPEN changeset</source>
+        <translation>MEGNYITja a változásokat</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
+        <source>CLOSE changeset</source>
+        <translation>LEZÁRja a változásokat</translation>
+    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -474,97 +500,97 @@ Kérem töltse le újra a bajos dolgokat, hogy megoldja az ütközést.</transla
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>nevenincs</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Piszkos réteg</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Feltöltött réteg</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Háttérkép</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>OSM-kivitel</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Kiviszem OSM-be…</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -592,12 +618,12 @@ Kérem töltse le újra a bajos dolgokat, hogy megoldja az ütközést.</transla
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -618,100 +644,73 @@ Kérem töltse le újra a bajos dolgokat, hogy megoldja az ütközést.</transla
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>hiba</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>nem töltött le eleget</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Megoldatlan ütközések</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Kérem előbb a meglévő ütközéseket oldja meg</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 letöltés</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Letöltök OSM-ről (csatlakozok)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Letöltöm a megoldatlan…</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Nem sikerült letölteni</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Letöltök %1 / %2 megoldatlan</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Érvénytelen név/jelszó</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Feldolgozok %1 / %2 megoldatlan</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Letöltök %1 / %2 nyompontot</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Feldolgozok...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
         <translation>XML-t dologozok fel</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
         <translation>Ütközések %1 adataiban</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Letöltök: %1,%2 (nagyít %3)...</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Letöltött nyom – pontok %1-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 letöltés</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Üres utat/kapcsolatot találtam</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Letöltök %1 / %2 megoldatlan</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Az üres utak/kapcsolatok valószínűleg hibák.
+Meg akarja jelölni őket törlésre?</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Feldolgozok %1 / %2 megoldatlan</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>%1 üres dolgot eltávolít</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
         <translation>Ütközéseket találtam</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
@@ -720,142 +719,160 @@ A dolgokat átmásoltam mint „conflict_…” a „Conflicts…” rétegbe.
 Mielőtt feltölthetné a változtatásait, saját kezűleg kell összevonnia a két változatot, illetve el kell távolítania egyiket a „Conflicts…” rétegből.</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Üres utat/kapcsolatot találtam</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Feltöltök…</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Az üres utak/kapcsolatok valószínűleg hibák.
-Meg akarja jelölni őket törlésre?</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Elkészítem a változásokat</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>%1 üres dolgot eltávolít</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>A szolgáló válaszára várok</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>hiba</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Letöltök…</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Letöltök OSM-ről (csatlakozok)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation>Váratlan HTTP állapotkód (%1)
 A szolgáló üzenete: „%2”</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 Az API-üzenete: „%1”</translation>
     </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation>
-            <numerusform>Letöltök OSM-ről (%n B)</numerusform>
-        </translation>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Nem sikerült letölteni</translation>
     </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation>
-            <numerusform>Letöltök OSM-ről (%n kB)</numerusform>
-        </translation>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Érvénytelen név/jelszó</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Letöltök…</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Megoldatlan ütközések</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Feldolgozok...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Kérem előbb a meglévő ütközéseket oldja meg</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Letöltöm a megoldatlan…</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Letöltök %1 / %2 nyompontot</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Feltöltök…</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Letöltött nyom – pontok %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Elkészítem a változásokat</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>A szolgáló válaszára várok</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Letöltök pontokat</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
         <source>OpenStreetBugs</source>
         <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Letöltök pontokat</translation>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Letöltök: %1,%2 (nagyít %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Bezár</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Nagyít</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Bezár</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -909,10 +926,20 @@ Delete what can be?</source>
         <translation>Hiányzó gyereket letölt</translation>
     </message>
     <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="442"/>
-        <source>Relations</source>
-        <translation>Kapcsolatok</translation>
-    </message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Kijelöléshez ad</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
+        <source>Delete</source>
+        <translation>Töröl</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="442"/>
+        <source>Relations</source>
+        <translation>Kapcsolatok</translation>
+    </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="443"/>
         <source>Roads</source>
@@ -928,20 +955,15 @@ Delete what can be?</source>
         <source>All</source>
         <translation>Mind</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Kijelöléshez ad</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
-        <source>Delete</source>
-        <translation>Töröl</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
     <message>
+        <location filename="../src/Docks/FeaturesDock.ui" line="14"/>
+        <source>Features</source>
+        <translation>Dolgok</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="72"/>
         <source>Only features fully within the viewport</source>
         <translation>Csak teljesen a látómezőben levők</translation>
@@ -949,17 +971,12 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.ui" line="14"/>
-        <source>Features</source>
-        <translation>Dolgok</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -977,7 +994,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="30"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
@@ -988,7 +1005,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Bezár</translation>
     </message>
@@ -998,17 +1015,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="47"/>
         <source>Filter list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="76"/>
@@ -1018,7 +1035,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="93"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
@@ -1044,270 +1061,244 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
-        <source>Geo Images</source>
-        <translation>Földképek</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Hálózati időzés</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
-        <source>Load geotagged Images</source>
-        <translation>Földcímkés képek betöltése</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Nem tudom olvasni a fénykép részleteit a Walking Papers-szolgálóról.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
-        <source>Select the layer to which the images belong:</source>
-        <translation>Válassza ki, melyik réteghez tartoznak a képek:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Kérem adjon meg Walking Papers URL-t</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
-        <source>Wrong image?</source>
-        <translation>Rossz kép?</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
-        <source>Loading Images ...</source>
-        <translation>Képeket töltök be …</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
+        <source>Geo Images</source>
+        <translation>Földképek</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Térképet középre</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
+        <source>Remove Images</source>
+        <translation>Képekeket távolít el</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
-        <source>Abort loading</source>
-        <translation>Betöltést megszakít</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
+        <source>Copy filename to clipboard</source>
+        <translation>Fájlnevet vágólapra másol</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
-        <source>Specify offset</source>
-        <translation>Adjon meg eltolást</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Következő kép</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
-        <source>Position images more to the:</source>
-        <translation>Helyezze a képeket inkább:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>PgDown</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
-        <source>end of the track</source>
-        <translation>a nyom végére</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Előző kép</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
-        <source>beginning of the track</source>
-        <translation>a nyom elejére</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>PgUp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
-        <source>hh:mm:ss</source>
-        <translation>óó:pp:mp</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Földcímkés képet met…</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
-        <source>ss 'seconds'</source>
-        <translation>mp „másodperc”</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Fénykép réteg</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
-        <source>mm 'minutes and' ss 'seconds'</source>
-        <translation>pp „perc és' mp 'másodperc'</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
+        <source>Load geotagged Images</source>
+        <translation>Földcímkés képek betöltése</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
-        <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
-        <translation>óó „óra” pp „perc' mp „másodperc”</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
+        <source>Select the layer to which the images belong:</source>
+        <translation>Válassza ki, melyik réteghez tartoznak a képek:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
-        <source>Image "%1" was taken %2 before the next trackpoint was recorded.
-Do you still want to use it?</source>
-        <translation>„%1” képet %2 idővel a következő nyompont rögzítése előtt készítették.
-Még mindig akarja használni?</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
-        <source>Image "%1" was taken %2 after the last trackpoint was recorded.
-Do you still want to use it?</source>
-        <translation>„%1” képet %2 idővel a következő nyompont rögzítése után készítették.
-Még mindig akarja használni?</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
-        <source>Remove Images</source>
-        <translation>Képekeket távolít el</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
+        <source>Loading Images ...</source>
+        <translation>Képeket töltök be …</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
-        <source>Copy filename to clipboard</source>
-        <translation>Fájlnevet vágólapra másol</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
+        <source>Abort loading</source>
+        <translation>Betöltést megszakít</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation>Nincs ilyen fájl</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>Nem találom „%1” képet.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation>Hiba „%2” fájlt megnyitván:
 %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Nincs nyompont</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Nincs nyompont „%1” képhez</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
         <translation>Hiba az EXIF-adatokat betöltvén „%1” fájlból.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
+        <source>Specify offset</source>
+        <translation>Adjon meg eltolást</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <source>Error while opening "%1":
-%2</source>
-        <translation>Hiba „%1” megnyitásakor:
-%2</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
+        <source>Position images more to the:</source>
+        <translation>Helyezze a képeket inkább:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Következő kép</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
+        <source>end of the track</source>
+        <translation>a nyom végére</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>PgDown</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
+        <source>beginning of the track</source>
+        <translation>a nyom elejére</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Előző kép</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
+        <source>hh:mm:ss</source>
+        <translation>óó:pp:mp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>PgUp</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Nincs nyompont</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Hálózati időzés</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Nincs nyompont „%1” képhez</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Nem tudom olvasni a fénykép részleteit a Walking Papers-szolgálóról.</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
+        <source>ss 'seconds'</source>
+        <translation>mp „másodperc”</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Kérem adjon meg Walking Papers URL-t</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
+        <source>mm 'minutes and' ss 'seconds'</source>
+        <translation>pp „perc és' mp 'másodperc'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
+        <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
+        <translation>óó „óra” pp „perc' mp „másodperc”</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Térképet középre</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
+        <source>Wrong image?</source>
+        <translation>Rossz kép?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Földcímkés képet met…</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
+        <source>Image "%1" was taken %2 before the next trackpoint was recorded.
+Do you still want to use it?</source>
+        <translation>„%1” képet %2 idővel a következő nyompont rögzítése előtt készítették.
+Még mindig akarja használni?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Fénykép réteg</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
+        <source>Image "%1" was taken %2 after the last trackpoint was recorded.
+Do you still want to use it?</source>
+        <translation>„%1” képet %2 idővel a következő nyompont rögzítése után készítették.
+Még mindig akarja használni?</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>JPEG Images (*.jpg)</source>
         <translation>JPEG-képek (*.jpg)</translation>
     </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <source>Error while opening "%1":
+%2</source>
+        <translation>Hiba „%1” megnyitásakor:
+%2</translation>
+    </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Érvénytelen OSM URL</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>Érvénytelen a megadott URL!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Érvénytelen koordináta-típus</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Kordináta '<bal hossz>, <alsó szél>, <jobb hossz>, <felső szél>' kell legyen</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Kordináta '<közép hossz>, <közép szél>, <kit szél>, <kit hossz>' kell legyen</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Menj</translation>
@@ -1320,17 +1311,17 @@ Még mindig akarja használni?</translation>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1363,125 +1354,151 @@ Még mindig akarja használni?</translation>
         <source>Search</source>
         <translation>Keres</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Érvénytelen OSM URL</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>Érvénytelen a megadott URL!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Érvénytelen koordináta-típus</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Kordináta '<bal hossz>, <alsó szél>, <jobb hossz>, <felső szél>' kell legyen</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Kordináta '<közép hossz>, <közép szél>, <kit szél>, <kit hossz>' kell legyen</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Shape-átalakító</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Nagyít</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Bezár</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>WMS-átalakító</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>TMS-átalakító</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Térkép – nincs</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Térkép – WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
-        <source>Map - TMS - %1</source>
-        <translation>Térkép – TMS - %1</translation>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
+        <source>Map - WMS-C - %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
-        <source>Map - %1</source>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
+        <source>Map - WMS-Tiled - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
+        <source>Map - TMS - %1</source>
+        <translation>Térkép – TMS - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <source>Map - %1</source>
         <translation>Térkép – %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
-        <translation type="unfinished">Csempeméret</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
-        <translation type="unfinished">Leképezés</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
-        <source>Map - WMS-C - %1</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
-        <source>Map - WMS-Tiled - %1</source>
-        <translation></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1501,7 +1518,7 @@ Is it really what you meant?</source>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1509,7 +1526,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
@@ -1554,7 +1571,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1564,12 +1581,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
@@ -1713,7 +1730,7 @@ Biztosan ki akar lépni?</translation>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
@@ -1729,14 +1746,14 @@ Biztosan ki akar lépni?</translation>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1751,19 +1768,17 @@ Biztosan ki akar lépni?</translation>
 <context>
     <name>Layer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>%n features</source>
-        <translation>
-            <numerusform>%n dolog</numerusform>
-        </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Dolgok</translation>
     </message>
@@ -1771,21 +1786,6 @@ Biztosan ki akar lépni?</translation>
 <context>
     <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Rétegek</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Mind</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>Nyomok</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
         <source>Show All</source>
@@ -1813,78 +1813,93 @@ Biztosan ki akar lépni?</translation>
         <translation>Bezár</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Rétegek</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Mind</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>Nyomok</translation>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
-        <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
-        <source>There are dirty features on this layer.
-Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Űrlap</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
-        <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
+        <source>Visible</source>
+        <translation>Látható</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
-        <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
+        <source>Readonly</source>
+        <translation>Csak olvasható</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Kis</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Nagy</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Teljes</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Takarás</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
-        <source>Visible</source>
-        <translation>Látható</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <source>Layer CLose: Dirty objects present</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
-        <source>Readonly</source>
-        <translation>Csak olvasható</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
+        <source>There are dirty features on this layer.
+Are you sure you want to close it? (no Undo possible)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Űrlap</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <source>Layer CLose: Not empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
+        <source>Are you sure you want to close this layer? (no Undo possible)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1892,17 +1907,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1916,2086 +1931,2054 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Mentetlen változások</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>A térképen elmentetlen változások vannak, amiket el fog veszíteni, amikor újat kezd.
-Mégsem akar új térképet, vagy folytatja eldobva a régi változásokat?</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>Se&gítő</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Nincs érvényes fájl</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 fájlt nem tudtam megnyitni.</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Út</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Feltöltés OSM-be</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Szerkeszt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Úgy tűnik nem adta meg
-OpenStreetMap azonosítóját és jelszavát.
-Meg akarja tenni ezt most?</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Nézet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Hiba letöltéskor</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>Kö&nyvjelzők</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Nem tudtam letölteni a térképet</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>&Leképezés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Utcaszámokat ad hozzá</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Beállítja a területek &takarását</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Térképstílus mentése</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Adatok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Merkaartor-térképstílus (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Kivisz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Térképstílus betöltése</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Legutóbb &nyitott</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Legutóbb be&hozott</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>&Eszköz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Stílus</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Pont</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>A&blak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Kivitel OSM-be</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Dokkok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>OSM-adatok (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>&Dolog</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Réteg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Könyvjelző hozzáadása</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Kap&csolat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Kérem adjon nevet a könyvjelzőnek.</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>&Mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Érvénytelen könyvjelzőnév</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Mutatja az irányjelző &nyilakat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>A könyvjelző nem lehet üres.</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Figyelem: már van ilyen könyvjelzőnév</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Kilép</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Adjon meg újat, vagy tartsa meg ugyanazt, hogy felülírjam, vagy töröljem.</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&Névjegy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Könyvjelző eltávolítása</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Megnyit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Válassza ki az eltávolítandó könyvjelzőt.</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Új dokumentumot készít, és behoz egy fájlt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>Se&gítő</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>&Mindent kinagyít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Készít</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Út</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>&Ablakot nagyít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Szerkeszt</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Ablakot nagyít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Nézet</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>Kö&nyvjelzők</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>&Leképezés</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Adatok</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Stílus</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Kilép</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&Névjegy</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Megnyit</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Új dokumentumot készít, és behoz egy fájlt</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>&Mindent kinagyít</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>&Ablakot nagyít</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Ablakot nagyít</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
+        <location filename="../src/MainWindow.ui" line="448"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
+        <location filename="../src/MainWindow.ui" line="457"/>
         <source>Zoom &out</source>
         <translation>&Kicsinyít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="469"/>
         <source>Zoom &in</source>
         <translation>&Nagyít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
         <source>Zoom in</source>
         <translation>Nagyít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
         <source>Curved link</source>
         <translation>Görbe bekötő</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
         <source>&Undo</source>
         <translation>&Vissza</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
+        <location filename="../src/MainWindow.ui" line="504"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
+        <location filename="../src/MainWindow.ui" line="513"/>
         <source>&Redo</source>
         <translation>&Újra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
+        <location filename="../src/MainWindow.ui" line="516"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Mozgat</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="540"/>
         <source>&Import</source>
         <translation>&Behoz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
+        <location filename="../src/MainWindow.ui" line="543"/>
         <source>Import a file into the current document</source>
         <translation>Fájlt hoz be a mostani dokumentumba</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Letölt</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Térképadatokat tölt le egy új területhez</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="558"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
+        <location filename="../src/MainWindow.ui" line="563"/>
         <source>Link</source>
         <translation>Bekötő</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
         <source>Create link</source>
         <translation>Bekötőt készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
+        <location filename="../src/MainWindow.ui" line="572"/>
         <source>L</source>
         <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>Ki&választ</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="587"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Feltölt</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Feltölti a változásokat a szolgálóra</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="602"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
+        <location filename="../src/MainWindow.ui" line="614"/>
         <source>R&emove</source>
         <translation>&Töröl</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Törli a kiválasztott dolgokat</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="620"/>
         <source>Del</source>
         <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Új utat készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Új pontot készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>Meg&fordít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Megfordítja az út irányát</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Menj…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Dupla út</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Utca&számokat ad hozzá (Karlsruhe-minta)</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Dupla utat készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Körforgalmat készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Új</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Új dokumentumot készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Feloszt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Felosztja az utat külön (összekapcsolt) utakra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Egyesít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Összekapcsolt utakat egyesít egyetlen úttá</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>Szét&vág</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Szakít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Szétszakít összekapcsolt utakat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Kap&csolat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Kapcsolatot teremt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Terület</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Új területet készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Szerkeszt…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Ment mi&nt…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Betölt…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Görbe út</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Beállítások…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Mind…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Minden látható réteget kivisz egy fájlba</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Keres…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Keres</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Keres és kiválaszt elemeket</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Látómező…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>A látómezőbeli dolgokat kiviszi egy fájlba</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Hiányzó gyereket letölt</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Hozzáad…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Töröl…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Összerak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Pontokat egyesít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Összerakja a kiválasztott pontokat (az első kiválasztott fog megmaradni)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Ment</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Fájlba ment</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Letölt még</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Pont</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>További térképadatokat tölt le a mostani területhez</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>Meg&fordít</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Letölti a mostani nézetet az előző letöltött rétegbe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Dupla út</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Új</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Tulajdonságok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Új dokumentumot készít</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Tulajdonságok dokkot rejt/mutat </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Feloszt</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Egyesít</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Rétegek dokkot rejt/mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>Szét&vág</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Kap&csolat</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Infó</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Terület</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Infó dokkot rejt/mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Ment</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Görbe út</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Igazít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Beállítások…</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Pontokat illeszt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Mind…</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>A kiválasztott pontokat igazítja. Az első kettő kiválasztott határozza meg a vonalat.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Minden látható réteget kivisz egy fájlba</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Látómező…</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>A látómezőbeli dolgokat kiviszi egy fájlba</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Hozzáad…</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Töröl…</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Vissza dokkot rejt/mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>Megoldatlan ütközések</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Kérem előbb a meglévő ütközéseket oldja meg</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Mutatja a le&töltött területeket</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Összerak</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Összerakja a kiválasztott pontokat (az első kiválasztott fog megmaradni)</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Másol</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Mentés Merkaartor-dokumentumba</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>A kiválasztott dolgokat és címkéket a vágólapra másolja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Merkaartor-dokumentum (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>A kiválasztott dolog címkéit másolja a vágólapra. Ha a dolog nyompont, akkor a helyzetét is másolja.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Címkéket szúr be (&átír)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Ment mi&nt…</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>A vágólapi címkéket beilleszti (illetve felülírja) a kiválasztott dologba.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Letölt még</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Címkéket szúr be (&összerak)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Letölti a mostani nézetet az előző letöltött rétegbe</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Címkebeillesztő</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Címkéket illeszt be a vágólapról (összefélsülve azokat a meglévő címkékkel)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Régi Qt-változatot érzékelve</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>A vágólapi címkéket összefésüli a kiválasztott dolog címkéivel.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>E telepítés Qt %1 válozatot használ. Ez különféle ismert hibákat tartalmaz, amik az adatokat OpenStreetMapra feltöltvén 401-es szolgáló válasz kódokat eredményeznek. Biztosan folytatni akarja? (Ezt nem ajánljuk.)
-További tudnivalók: http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>nevenincs</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Kiválasztott…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>A&blak</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Dolgo(ka)t illeszt be</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Dokkok</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Beilleszt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Tulajdonságok dokkot rejt/mutat </translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Dolgokat illeszt be a vágólapról</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Beilleszti a vágólapi dolgokat. Ha e dolgok már a dokumentumban vannak, akkor felülírja azokat.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Rétegek dokkot rejt/mutat</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Infó dokkot rejt/mutat</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (gépi kód)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Feltöltést erőltet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Átteszi a dolgot a piszkos rétegbe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Átteszi a kiválasztott dolgot egy nem feltölthető rétegből (pl. nyom vagy kivonat) a piszkos rétegbe előkészítve azt a feltöltésre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Keres…</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Eszköztár be/ki</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Keres és kiválaszt elemeket</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Rejti/mutatja az eszköztárt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Igazít</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Mindent rejt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>A kiválasztott pontokat igazítja. Az első kettő kiválasztott határozza meg a vonalat.</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Mindent mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>&Kép réteg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Kép/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>&Pontokat mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>%2 „%1” címkéjét törli</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>&Neveket mutat</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>%1 területet készít</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Terület: %1 utat készít</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Indít</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Terület: %1 utat befejez</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>GPS-t indít</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Terület: %1 pontot %2 úthoz adja</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>I&smét…</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>GPS-t ismétel</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Pontokat ad %1 dupla úthoz</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Rejti/mutatja a GPS dokkot</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Készíti %1 dupla utat</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Pontot készít %1 útra</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>Meg&állít</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>GPS-t megállít</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Körforgalmat készít %1</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>GPS &középre</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>%1 pontot készíti %2 úton</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Mutatja a nyom&szakaszokat</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Utat készít: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Mutatja a &méretarányt</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Mutatja a &kapcsolatokat</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>%1 dolgot törli</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Mutatja az utak hátterét</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Mutatja az utak kereteit</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Mutatja a javításokat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Utakat egyesít</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Rögzít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Utat oszt fel</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>GPS-szel rögzít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Utat szakít ketté</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Szünet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Érvénytelen fájl</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>GPS szünet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Pontokat igazít</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>&Földkép</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Pontokat %1 dologba rak</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Rejti/mutatja a GeoImage dokkot</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Vissza dokkot rejt/mutat</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>%1 kapcsolat változott</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Világ OSB-igazgató…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Ajánlatos a változásokat elmenteni egy dokumentumba feltöltés után.
-Meg akarja ezt tenni most?</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Gyorsgomb szerkesztő…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Érvénytelen vágólap</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Összerak…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>%1 kapcsolatot készít</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Ment…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>Tagot ad &hozzá</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>A kiválasztott dolog címkéit másolja a vágólapra. Ha a dolog nyompont, akkor a helyzetét is másolja.</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>Tagot &kivesz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Soha</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>A vágólapi címkéket beilleszti (illetve felülírja) a kiválasztott dologba.</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>&Egyirányú utakhoz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Mindig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>A vágólapi címkéket összefésüli a kiválasztott dolog címkéivel.</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Kicsatol</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Pontot csatol ki egy útból</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Kiválasztott…</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Kicsatol egy pontot egy útból</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Beilleszti a vágólapi dolgokat. Ha e dolgok már a dokumentumban vannak, akkor felülírja azokat.</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Kapcsolat nélküli munka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Stílus</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (gépi kód)</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Stílus dokkot rejt/mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 érvénytelen Merkaartor dokumentum.</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Strg+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Átteszi a kiválasztott dolgot egy nem feltölthető rétegből (pl. nyom vagy kivonat) a piszkos rétegbe előkészítve azt a feltöltésre</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Kivitel GPX-be</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPX adatok (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>Törli az eldobható &párbeszéd állapotot</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Kivitel KML-be</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>GPS-menü</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KML-adatok (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Nézőke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>&Összekötőt készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Forgat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Címkézi: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Pontot készít: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>%1 pontot adja %2 úthoz</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>csempe %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Dolgok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Tulajdonságok…</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Utca&számokat ad hozzá (Karlsruhe-minta)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Útpontok</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Nyom %1</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>GPS-hiba</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Nem tudok GPS-kaput nyitni.</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>&Látszó pontokat mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>NMEA-naplófájl megnyitása</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Szél/hossz &hálót mutat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Réteg</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>Nagyítást &csempés háttérhez rögzít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Mutatja a le&töltött területeket</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>&Leképezés-szerkesztő…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Eszköztár be/ki</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>&Fényképeket mutat a térképen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Rejti/mutatja az eszköztárt</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Mindent rejt</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Törlést erőltet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Mindent mutat</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Bezár</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>&Kép réteg</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>&Egyszerűsít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Ut(ak)at egyszerűsít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>Utakat egyszerűsít a szükségtelen gyerekpontok eltávolításával</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Indít</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>I&smét…</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Rejti/mutatja a GPS dokkot</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>Meg&állít</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>GPS &középre</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Mutatja a nyom&szakaszokat</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Mutatja a &méretarányt</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Mutatja a &kapcsolatokat</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Mutatja az utak hátterét</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Mutatja az utak kereteit</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Mutatja a javításokat</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Rögzít</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Szünet</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Tulajdonságok…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Rejti/mutatja a GeoImage dokkot</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Nagy kövér figyelmeztetés szerzői jogra</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Nem tudom megnyitni a mentésfájlt</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>Nem tudtam %1 fájlt írásra megnyitni.</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Letölt</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Feltölt</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Menj…</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Dupla utat készít</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Körforgalmat készít</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Kapcsolatot teremt</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Keres</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Pontokat egyesít</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Átteszi a dolgot a piszkos rétegbe</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>GPS-t indít</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>GPS-t ismétel</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>GPS-t megállít</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>GPS-szel rögzít</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>GPS szünet</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Világ OSB-igazgató…</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Gyorsgomb szerkesztő…</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Hiányzó gyereket letölt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Mutatja az irányjelző &nyilakat</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Beállítja a területek &takarását</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Kivisz</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>%2 „%1” címkéjét törli</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Legutóbb &nyitott</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>%1 címkéket törli %2 dolgon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Legutóbb be&hozott</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>&Eszköz</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>„%1” tagot kiveszi %2 dologból</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>&Dolog</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>%1 kapcsolat tagjait rendezi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&GPS</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>%1 kapcsolat változott</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Kap&csolat</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Pont készítése</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Pontot készít %1 útra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Mozgat</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Terület készítése</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>Ki&választ</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>%1 területet készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Szerkeszt…</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Terület: %1 utat készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Ment…</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Lyukat ad hozzá.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Betölt…</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Akar (még) egy lyukat adni e területhez?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Másol</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Terület: %1 utat befejez</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Címkéket szúr be (&átír)</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Terület: %1 pontot %2 úthoz adja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Címkéket szúr be (&összerak)</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Összerak…</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>Tagot ad &hozzá</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Pontokat ad %1 dupla úthoz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>Tagot &kivesz</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Készíti %1 dupla utat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Soha</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>&Egyirányú utakhoz</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>BAL-KATT kezd;HÚZÁS méretez;SHIFT-HÚZÁS forgat;BAL-KATT befejez</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Mindig</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Sokszög készítése</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Kicsatol</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>%1 sokszöget készíti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Kicsatol egy pontot egy útból</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Körforgalom készítése</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Kapcsolat nélküli munka</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Körforgalmat készít %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Út készítése</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Pontokat találtam ugyanitt.</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>%1 pontot készíti %2 úton</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Össze akar rakni minden pontot egyetlen egybe a beejtés helyén?</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Utat készít: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Kis</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Pontot készít: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Nagy</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>%1 pontot adja %2 úthoz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Teljes</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Szerkesztés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>%1 dolgot törli</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Gyerekeket töröl.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Rétegek</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Dolog</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Pont</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>BAL-KATT kiválaszt;BAL-HÚZÁS mozgat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Út</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Pontok mozgatása</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Kapcsolat</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Pontokat mozgat</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>%1 pontot mozgatja</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Pontokat találtam ugyanitt.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Össze akar rakni minden pontot egyetlen egybe a beejtés helyén?</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Pontokat %1 dologba rak</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Forgatás</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>BAL-KATT az első sarok -> BAL-HÚZÁS területet ad meg -> BAL-KATT nagyít</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Nagyítás</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
+        <location filename="../src/MainWindow.cpp" line="191"/>
         <source>GPS Exchange format (*.gpx)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
+        <location filename="../src/MainWindow.cpp" line="192"/>
         <source>OpenStreetMap format (*.osm)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
+        <location filename="../src/MainWindow.cpp" line="193"/>
         <source>OpenStreetMap change format (*.osc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
+        <location filename="../src/MainWindow.cpp" line="194"/>
         <source>Noni GPSPlot format (*.ngt)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
+        <location filename="../src/MainWindow.cpp" line="195"/>
         <source>NMEA GPS log format (*.nmea *.nma)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
+        <location filename="../src/MainWindow.cpp" line="196"/>
         <source>KML file (*.kml)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
+        <location filename="../src/MainWindow.cpp" line="197"/>
         <source>Comma delimited format (*.csv)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
+        <location filename="../src/MainWindow.cpp" line="200"/>
         <source>Geotagged images (*.jpg)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
+        <location filename="../src/MainWindow.cpp" line="202"/>
         <source>ESRI Shapefile (*.shp)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
+        <location filename="../src/MainWindow.cpp" line="202"/>
         <source>Geography Markup Language (*.gml)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
+        <location filename="../src/MainWindow.cpp" line="204"/>
         <source>Protobuf Binary Format (*.pbf)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="208"/>
         <source>Merkaartor document (*.mdc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation type="unfinished">Út</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>csempe %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation type="unfinished">Képet betölt</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Nem tudom Projections fájlt betölteni</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation type="unfinished">Pont helyzetét képhez adja</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>„Projections.xml”-t sehol sem tudom megnyitni. Leállok.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation type="unfinished">Képet földcímkéz e helyzettel</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Kis</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Mégsem</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Nagy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Eszközök</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Teljes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Dolog</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Pont</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Kapcsolat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Mégsem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Rétegek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Út</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Eszközök</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Érvénytelen vágólap</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Mentetlen változások</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>A térképen elmentetlen változások vannak, amiket el fog veszíteni, amikor újat kezd.
+Mégsem akar új térképet, vagy folytatja eldobva a régi változásokat?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Útpontok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Nyom %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>%1 pontot kicsatolja</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Nagy kövér figyelmeztetés szerzői jogra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Tagot ad a kapcsolathoz</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Tagot kivesz a kapcsolatból</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Címkesablonok mentése</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Merkaartor-címkesablonok (*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Címkesablon megnyitása</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>„%1” tagot kiveszi %2 dologból</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
         <source>You are trying to import a KML file. Please be aware that:
 
  - You cannot import to OSM a KML file created from Google Earth. While you might
@@ -4024,746 +4007,799 @@ Ha bizonytalan, kérem kérjen tanácsot a „legal” vagy a „talk” Openstr
 Teljesen biztos ön abban, hogy e KML-t van joga bevinni OSM-be?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Térképadatokat tölt le egy új területhez</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Nincs érvényes fájl</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Feltölti a változásokat a szolgálóra</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 fájlt nem tudtam megnyitni.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Törli a kiválasztott dolgokat</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Új utat készít</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Új pontot készít</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Megfordítja az út irányát</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Felosztja az utat külön (összekapcsolt) utakra</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Összekapcsolt utakat egyesít egyetlen úttá</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Régi Qt-változatot érzékelve</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Szakít</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>E telepítés Qt %1 válozatot használ. Ez különféle ismert hibákat tartalmaz, amik az adatokat OpenStreetMapra feltöltvén 401-es szolgáló válasz kódokat eredményeznek. Biztosan folytatni akarja? (Ezt nem ajánljuk.)
+További tudnivalók: http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Szétszakít összekapcsolt utakat</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Feltöltés OSM-be</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Új területet készít</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Úgy tűnik nem adta meg
+OpenStreetMap azonosítóját és jelszavát.
+Meg akarja tenni ezt most?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Fájlba ment</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Hiba letöltéskor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>További térképadatokat tölt le a mostani területhez</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Nem tudtam letölteni a térképet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Pontokat illeszt</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Hiba OpenStreetBugs letöltésekor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>A kiválasztott dolgokat és címkéket a vágólapra másolja</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>OpenStreetBugs-ot nem tudtam letölteni</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Címkebeillesztő</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Címkéket illeszt be a vágólapról (összefélsülve azokat a meglévő címkékkel)</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Beilleszt</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Sokszög készítése</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Dolgokat illeszt be a vágólapról</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Adja meg az oldalak számát</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Pontot csatol ki egy útból</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Utakat egyesít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Tulajdonságok</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Utat oszt fel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Infó</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Utat szakít ketté</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Utakat egyszerűsít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>&Földkép</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Dolgok feltöltését erőlteti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Stílus</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Hálózati időzés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Stílus dokkot rejt/mutat</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Nem tudok csatlakozni OpenStreetBugs-hoz.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Hiba lezáráskor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Lyukat ad hozzá.</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Nem tudok hibát törölni. A szolgáló üzenete:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Akar (még) egy lyukat adni e területhez?</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Összekötőt készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Nem tudom Projections fájlt betölteni</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Többszöri metszés.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>„Projections.xml”-t sehol sem tudom megnyitni. Leállok.</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Az utak többször metszik egymást.
+(Később törölheti azt, ami nem kell.) Még mindig akar összekötőt készíteni mindegyikhez?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Összekötőt készít</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Utcaszámokat ad hozzá</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Érvénytelen leképezés</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Nem tudom beállítani „%1” leképezést.</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Strg+B</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>Törli az eldobható &párbeszéd állapotot</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>GPS-menü</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Nézőke</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>&Összekötőt készít</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Gyerekeket töröl.</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Címkéket tesz több dologba</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Terület készítése</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Pont készítése</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>BAL-KATT kezd;HÚZÁS méretez;SHIFT-HÚZÁS forgat;BAL-KATT befejez</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Sokszög készítése</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>%1 sokszöget készíti</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Körforgalom készítése</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Út készítése</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Szerkesztés</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Pontokat mozgat</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Pontokat igazít</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>%1 pontot mozgatja</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>BAL-KATT kiválaszt;BAL-HÚZÁS mozgat</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>%1 pontot kicsatolja</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Pontok mozgatása</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Tagot ad a kapcsolathoz</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Tagot kivesz a kapcsolatból</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Forgatás</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>BAL-KATT az első sarok -> BAL-HÚZÁS területet ad meg -> BAL-KATT nagyít</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Nagyítás</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Sokszög készítése</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>%1 kapcsolatot készít</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Adja meg az oldalak számát</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Térképstílus mentése</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Dolgok feltöltését erőlteti</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Merkaartor-térképstílus (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Feltöltést erőltet</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Térképstílus betöltése</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Forgat</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Többszöri metszés.</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Az utak többször metszik egymást.
-(Később törölheti azt, ami nem kell.) Még mindig akar összekötőt készíteni mindegyikhez?</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Dolgo(ka)t illeszt be</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>nevenincs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Dolgok</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Mentés Merkaartor-dokumentumba</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>&Látszó pontokat mutat</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Merkaartor-dokumentum (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>&Mutat</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Nem tudom megnyitni a mentésfájlt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Kép/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>Nem tudtam %1 fájlt írásra megnyitni.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>&Pontokat mutat</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>&Neveket mutat</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Érvénytelen fájl</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 érvénytelen Merkaartor dokumentum.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Kivitel OSM-be</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>OSM-adatok (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>Szél/hossz &hálót mutat</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>OSMChange-kivitel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>Nagyítást &csempés háttérhez rögzít</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>OSMChange adat (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>&Leképezés-szerkesztő…</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Kivitel GPX-be</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>&Fényképeket mutat a térképen</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPX adatok (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Kivitel KML-be</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Törlést erőltet</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KML-adatok (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Bezár</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>&Egyszerűsít</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Ut(ak)at egyszerűsít</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Utakat egyszerűsít a szükségtelen gyerekpontok eltávolításával</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>%1 címkéket törli %2 dolgon</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Könyvjelző hozzáadása</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>%1 kapcsolat tagjait rendezi</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Kérem adjon nevet a könyvjelzőnek.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Hiba OpenStreetBugs letöltésekor</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Érvénytelen könyvjelzőnév</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>OpenStreetBugs-ot nem tudtam letölteni</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>A könyvjelző nem lehet üres.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Utakat egyszerűsít</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Figyelem: már van ilyen könyvjelzőnév</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Hálózati időzés</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Adjon meg újat, vagy tartsa meg ugyanazt, hogy felülírjam, vagy töröljem.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Nem tudok csatlakozni OpenStreetBugs-hoz.</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Könyvjelző eltávolítása</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Hiba lezáráskor</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Válassza ki az eltávolítandó könyvjelzőt.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Nem tudok hibát törölni. A szolgáló üzenete:
-%1</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Érvénytelen leképezés</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Nem tudom beállítani „%1” leképezést.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>OSMChange-kivitel</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>GPS-hiba</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>OSMChange adat (*.osc)</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Nem tudok GPS-kaput nyitni.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>NMEA-naplófájl megnyitása</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Címkesablonok mentése</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Merkaartor-címkesablonok (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Címkesablon megnyitása</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
-        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>utoljára: </i><b>%1</b> <b>%2</b> által</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Megoldatlan ütközések</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>utoljára: </i><b>%1</b></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Kérem előbb a meglévő ütközéseket oldja meg</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
-        <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Ajánlatos a változásokat elmenteni egy dokumentumba feltöltés után.
+Meg akarja ezt tenni most?</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Címkéket tesz több dologba</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>size</source>
-        <translation>méret</translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Címkézi: %1</translation>
     </message>
+</context>
+<context>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
-        <source>Topleft</source>
-        <translation>Bal felső</translation>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
+        <source><i>V: </i><b>%1</b> </source>
+        <translation><i>V: </i><b>%1</b> </translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
-        <source>Botright</source>
-        <translation>Jobb alsó</translation>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
+        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
+        <translation><i>utoljára: </i><b>%1</b> <b>%2</b> által</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
-        <source>Relation</source>
-        <translation>Kapcsolat</translation>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>utoljára: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
-        <source>Role</source>
-        <translation>Szerep</translation>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
+        <source><br/><i>layer: </i><b>%1</b> </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
-        <source>Member</source>
-        <translation>Tag</translation>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Út</translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Útpont</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
         <source>coord</source>
         <translation>helyzet</translation>
     </message>
     <message>
         <location filename="../src/Features/Node.cpp" line="379"/>
         <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Pont</translation>
+        <source>description</source>
+        <translation>jellemzés</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>%1 pont</translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>megjegyzés</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
-        <source>Length</source>
-        <translation>Hossz</translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Pont</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
-        <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>magasság</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>Size</source>
-        <translation>Méret</translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>sebesség</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Terület</translation>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>size</source>
+        <translation>méret</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>magasság</translation>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>members</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>sebesség</translation>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
+        <source>Topleft</source>
+        <translation>Bal felső</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Útpont</translation>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
+        <source>Botright</source>
+        <translation>Jobb alsó</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>jellemzés</translation>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
+        <source>Relation</source>
+        <translation>Kapcsolat</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>megjegyzés</translation>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
+        <source>Role</source>
+        <translation>Szerep</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>members</source>
-        <translation></translation>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
+        <source>Member</source>
+        <translation>Tag</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
-        <source><i>V: </i><b>%1</b> </source>
-        <translation><i>V: </i><b>%1</b> </translation>
+        <location filename="../src/Features/Way.cpp" line="903"/>
+        <source>Closed way</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
+        <location filename="../src/Features/Way.cpp" line="906"/>
+        <source>Length</source>
+        <translation>Hossz</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>Size</source>
+        <translation>Méret</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>%1 pont</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Terület</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Út</translation>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
-        <translation type="unfinished">Leképezés</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Új szolgáló</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Új könyvjelző</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Beállítás feltöltése nem sikerült</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Dupla kulcs</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Több mint 150 beállítás</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Új könyvjelző</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Új szolgáló</translation>
     </message>
 </context>
 <context>
@@ -4792,17 +4828,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Ismeretlen mező</translation>
     </message>
@@ -4815,25 +4851,10 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Hiba!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Nincs meg a névkereső-szolgálat gazda.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>A névkereső-szolgálat gazda elutasította a kapcsolatot.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>A névkereső-szolgálat gazda hitelesítést igényel.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Ismeretlen hiba.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4854,11 +4875,6 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4866,10 +4882,15 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
@@ -4887,62 +4908,62 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation type="unfinished">Kép/SVG-kivitel</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
         <source>min lat/Lon</source>
-        <translation type="unfinished">min szél/hossz</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="90"/>
         <source>max lat/Lon</source>
-        <translation type="unfinished">max szél/hossz</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
         <source>Show Scale</source>
-        <translation type="unfinished">Arányt mutat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4971,65 +4992,26 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Mindig</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Színt választ</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Térképstílus-szerkesztő</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
-        <source>Add</source>
-        <translation>Hozzáad</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
-        <source>Remove</source>
-        <translation>Eltávolít</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
-        <source>Tag selection</source>
-        <translation>Címkeválasztás</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
-        <source>meter/pixel</source>
-        <translation>méter/képpont</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
-        <source>Visible up to</source>
-        <translation>Látható max</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
+        <source>Global</source>
+        <translation>Mindenre</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
-        <source>Visible from scale</source>
-        <translation>Látható min</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
+        <source>Background</source>
+        <translation>Háttér</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
@@ -5048,6 +5030,11 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>…</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
@@ -5068,26 +5055,19 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Rögzített vastagság</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
-        <source>Dashed</source>
-        <translation>Szaggatott</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
-        <source>off</source>
-        <translation>ki</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
+        <source>Filter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
-        <source>Fill area</source>
-        <translation>Kitöltés</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
+        <source>Add</source>
+        <translation>Hozzáad</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
-        <source>Draw icon</source>
-        <translation>Ikont rajzol</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
+        <source>Remove</source>
+        <translation>Eltávolít</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
@@ -5095,20 +5075,25 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Másol</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
-        <source>Background</source>
-        <translation>Háttér</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
+        <source>Tag selection</source>
+        <translation>Címkeválasztás</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
+        <source>meter/pixel</source>
+        <translation>méter/képpont</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
+        <source>Visible up to</source>
+        <translation>Látható max</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
+        <source>Visible from scale</source>
+        <translation>Látható min</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5118,9 +5103,26 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Rajzoló szín</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
+        <source>Dashed</source>
+        <translation>Szaggatott</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
+        <source>off</source>
+        <translation>ki</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
+        <source>Fill area</source>
+        <translation>Kitöltés</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5130,12 +5132,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5148,9 +5150,14 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Vonalat rajzol</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
+        <source>Draw icon</source>
+        <translation>Ikont rajzol</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5168,6 +5175,16 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Felirat</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
+        <source>Halo</source>
+        <translation>Körül</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
+        <source>Area</source>
+        <translation>Terület</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
         <translation>Háttérszínnel rajzol</translation>
@@ -5178,19 +5195,23 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Háttércímkével jelöl</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
-        <source>Halo</source>
-        <translation>Körül</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
-        <source>Area</source>
-        <translation>Terület</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Mindig</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
-        <source>Global</source>
-        <translation>Mindenre</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Színt választ</translation>
     </message>
 </context>
 <context>
@@ -5209,7 +5230,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
@@ -5240,6 +5261,11 @@ What do you want to do next?</source>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5253,25 +5279,20 @@ What do you want to do next?</source>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>SVG-fájlok (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Image files (*.png *.jpg)</source>
         <translation>Képfájlok (*.png *.jpg)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVG-fájlok (*.svg)</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -5301,299 +5322,298 @@ What do you want to do next?</source>
         <translation>Kis/nagy takarás</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
-        <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
+        <source>Single mouse button interaction</source>
+        <translation>Egyszeri egérgomb kölcsönhatás</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
+        <source>Use custom Qt style</source>
+        <translation>Egyedi QT-stílust használ</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
-        <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
-        <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Külön mozgató mód</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
-        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Látszó pontokat használ (új munkamenet kell)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
-        <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Lehet rejtett kapcsolatokat választani</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
-        <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
+        <source>Colors</source>
+        <translation>Színek</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
-        <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
+        <source>Background</source>
+        <translation>Háttér</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
-        <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
+        <source>...</source>
+        <translation>…</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
-        <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
+        <source>Overwrite style</source>
+        <translation>Stílust felülír</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Térképstílus</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>GPS-nyom</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Egyedi</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
+        <source>Pixels</source>
+        <translation>Képpontok</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Egyszerű GPX-nyom megjelenést használ</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Felület</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Fedés</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Jelszó:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Kapcsolatok</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Hálózat</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Fókusz</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Átjátszó-beállítás</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Kiemelés</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Átjátszót használ</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Gazda:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Nyelv</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation>Kapu:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Talán újra kell indítania a programot, hogy érvényesüljenek e változások</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Háttérkép</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>E nyelvet használja</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
-        <translation>Gyorstár mappa</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Lefordítja a szabványos címkéket</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Gyorstár méret (MB-ban; 0 letilt)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
+        <source>Rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
-        <translation>Térkép-átalakító</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
+        <source>Options</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Adatok</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
+        <source>Use Anti-aliasing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Dokumentumok</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
+        <source>Disable Anti-alisaing while panning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
-        <source>Autosave documents after upload</source>
-        <translation>Magától ment dokumentumokat feltöltés után</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
+        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Beépített</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
+        <source>Use current style for wireframe rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
-        <source>Tracks</source>
-        <translation>Nyomok</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
+        <source>Editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
-        <source>Automatically extract tracks on open</source>
-        <translation>Magától von ki nyomokat megnyitáskor</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
+        <source>Quick editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Tiltja a stílusokat nyom rétegekben</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
+        <source>Wireframe editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Színt választ</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
+        <source>Full render editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Meglévő eszköz</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Térképstílus</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Ilyen nevű eszköz már van.
-Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a meglévőt akarja megváltoztatni</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Egyedi stílus mappa</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Nem törölhet előre beállított eszközt</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Mostani stílus</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Nem törölheti „%1” előre beállított eszközt</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Tiltja a stílusokat nyom rétegekben</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Nem változtathat előre beállított eszköz nevén</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Sablon</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Nem változtathatja meg „%1” előre beállított eszköz nevét</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Címkesablon</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Eszközprogramot választ</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Beépített</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Egyedi</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Adatok</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Naplómappát választ</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
+        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
-        <source>Colors</source>
-        <translation>Színek</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
+        <source>XAPI</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
-        <source>Background</source>
-        <translation>Háttér</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Fedés</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
+        <source>Nominatim (Geo Search)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Fókusz</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Dokumentumok</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Kapcsolatok</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
+        <source>Autosave documents after upload</source>
+        <translation>Magától ment dokumentumokat feltöltés után</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
-        <source>...</source>
-        <translation>…</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
+        <source>Tracks</source>
+        <translation>Nyomok</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
+        <source>Automatically extract tracks on open</source>
+        <translation>Magától von ki nyomokat megnyitáskor</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
-        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
+        <source>Track layers readonly by default</source>
+        <translation>Nyomrétegek alapesetben csak olvashatók</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
-        <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
+        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
+        <translation>Ne kössön össze ennél távolabbi GPX-pontokat (km-ben; a 0 mellőzés)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
-        <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5601,146 +5621,145 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
-        <source>Save NMEA log</source>
-        <translation>NMEA-naplót vezet</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>GPS bemenet</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation>Rendszeridőt GPS-hez igazít</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Soros</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
-        <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Kapu</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
-        <source>Tools</source>
-        <translation>Eszközök</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Gazda</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
-        <source>Name:</source>
-        <translation>Név:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
+        <source>Save NMEA log</source>
+        <translation>NMEA-naplót vezet</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
-        <source>Path:</source>
-        <translation>Ösvény:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation>Rendszeridőt GPS-hez igazít</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
-        <source>Apply</source>
-        <translation>Alkalmaz</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation>Hálózat</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
-        <source>Add</source>
-        <translation>Hozzáad</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation>Átjátszó-beállítás</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
-        <source>Remove</source>
-        <translation>Eltávolít</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation>Átjátszót használ</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Nyelv</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Jelszó:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Talán újra kell indítania a programot, hogy érvényesüljenek e változások</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Használó:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>E nyelvet használja</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation>Kapu:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Lefordítja a szabványos címkéket</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Gazda:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
-        <source>Pixels</source>
-        <translation>Képpontok</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Külön mozgató mód</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation>Megengedi a JOSM-kompatíbilis helyi szolgálót a 8111 kapun</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
-        <source>Single mouse button interaction</source>
-        <translation>Egyszeri egérgomb kölcsönhatás</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation>Háttérkép</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
-        <source>Use custom Qt style</source>
-        <translation>Egyedi QT-stílust használ</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation>Csempe gyorstárazás (nem működik Yahoo! esetében jogi korlátozások miatt)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
-        <source>Overwrite style</source>
-        <translation>Stílust felülír</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation>Gyorstár mappa</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Sablon</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation>Gyorstár méret (MB-ban; 0 letilt)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Címkesablon</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation>Térkép-átalakító</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
-        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation>Ne kössön össze ennél távolabbi GPX-pontokat (km-ben; a 0 mellőzés)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
+        <source>Automatically add "source" tag when creating features over a background map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
+        <source>Tools</source>
+        <translation>Eszközök</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Csempe gyorstárazás (nem működik Yahoo! esetében jogi korlátozások miatt)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
+        <source>Name:</source>
+        <translation>Név:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartor címkesablon (*.mat)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
+        <source>Path:</source>
+        <translation>Ösvény:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
-        <source>Track layers readonly by default</source>
-        <translation>Nyomrétegek alapesetben csak olvashatók</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
+        <source>Apply</source>
+        <translation>Alkalmaz</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Egyedi stílus mappa</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
+        <source>Add</source>
+        <translation>Hozzáad</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Mostani stílus</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
+        <source>Remove</source>
+        <translation>Eltávolít</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
@@ -5755,7 +5774,7 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
         <source>Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
@@ -5763,6 +5782,11 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <translation>Cseh</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Holland</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
         <translation>Német</translation>
@@ -5775,7 +5799,7 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
         <source>Hungarian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
@@ -5785,7 +5809,7 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
         <source>Japanese</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
@@ -5793,110 +5817,101 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <translation>Lengyel</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Orosz</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Használó:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Kiemelés</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Portugál</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>GPS-nyom</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>Brazíliai portugál</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Egyszerű GPX-nyom megjelenést használ</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Orosz</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>GPS bemenet</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Szlovák</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Spanyol</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Soros</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Svéd</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Kapu</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>Ukrán</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Gazda</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartor címkesablon (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Látszó pontokat használ (új munkamenet kell)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Színt választ</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Holland</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Meglévő eszköz</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Portugál</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Ilyen nevű eszköz már van.
+Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a meglévőt akarja megváltoztatni</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Szlovák</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Nem törölhet előre beállított eszközt</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Spanyol</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Nem törölheti „%1” előre beállított eszközt</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Svéd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Nem változtathat előre beállított eszköz nevén</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>Ukrán</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Nem változtathatja meg „%1” előre beállított eszköz nevét</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Lehet rejtett kapcsolatokat választani</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Eszközprogramot választ</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Felület</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>Megengedi a JOSM-kompatíbilis helyi szolgálót a 8111 kapun</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Brazíliai portugál</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Naplómappát választ</translation>
     </message>
 </context>
 <context>
@@ -5949,7 +5964,7 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5957,7 +5972,7 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5970,40 +5985,40 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6017,10 +6032,19 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
 <context>
     <name>PropertiesDock</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
-        <source>Properties</source>
-        <translation>Tulajdonságok</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
+        <source>%1/%1 selected item(s)</source>
+        <translation>%1/%1 kiválasztott elem</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
+        <source>%1/%2 selected item(s)</source>
+        <translation>%1/%2 kiválasztott elem</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
+        <source>Selected items</source>
+        <translation>Kiválasztott elemek</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
@@ -6028,9 +6052,9 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <translation>Tulajdonságok – Több elem</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
-        <source>Properties - Relation</source>
-        <translation>Tulajdonságok – Kapcsolat</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Tulajdonságok – Pont</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
@@ -6038,82 +6062,50 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <translation>Tulajdonságok – Út</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
-        <source>Center map</source>
-        <translation>Térképet középre</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
-        <source>Center && Zoom map</source>
-        <translation>Térképet középre nagyítva</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
+        <source>Properties - Relation</source>
+        <translation>Tulajdonságok – Kapcsolat</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
-        <source>%1/%1 selected item(s)</source>
-        <translation>%1/%1 kiválasztott elem</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
+        <source>Properties</source>
+        <translation>Tulajdonságok</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
-        <source>%1/%2 selected item(s)</source>
-        <translation>%1/%2 kiválasztott elem</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
+        <source>Error reading template file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
-        <source>Selected items</source>
-        <translation>Kiválasztott elemek</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
+        <source>Center map</source>
+        <translation>Térképet középre</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
-        <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
+        <source>Center && Zoom map</source>
+        <translation>Térképet középre nagyítva</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
         <source>Select member</source>
         <translation>Tagot választ</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Tulajdonságok – Pont</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Mégsem</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
-        <translation type="unfinished">Zuhatagosan takarít</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="66"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="74"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="188"/>
         <source>Set Tag '%1=%2' on %3</source>
-        <translation type="unfinished">„%1=%2” címkét tesz %3 dolgra</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="314"/>
@@ -6126,44 +6118,67 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <location filename="../src/Commands/NodeCommands.cpp" line="25"/>
         <location filename="../src/Commands/NodeCommands.cpp" line="111"/>
         <source>Move node %1</source>
-        <translation type="unfinished">Mozgatja %1 pontot</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Mégsem</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
-        <translation type="unfinished">OSMChange-behozatal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportNGT.cpp" line="21"/>
         <source>Import NGT</source>
-        <translation type="unfinished">NGT-behozatal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
-        <translation type="unfinished">NMEA-behozatal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6179,14 +6194,14 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6216,7 +6231,7 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6227,12 +6242,12 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>GPS-naplóhiba</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Nem tudok GPS naplófáljt készíteni: %1.</translation>
     </message>
@@ -6240,24 +6255,29 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
-        <source>GPS log error</source>
-        <translation>GPS-naplóhiba</translation>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
+        <source>Unable to connect to %1:%2</source>
+        <translation>Nem tudok csatlakozni ide: %1:%2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
-        <source>Unable to create GPS log file: %1.</source>
-        <translation>Nem tudok GPS naplófáljt készíteni: %1.</translation>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
+        <source>GPS log error</source>
+        <translation>GPS-naplóhiba</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
-        <source>Unable to connect to %1:%2</source>
-        <translation>Nem tudok csatlakozni ide: %1:%2</translation>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
+        <source>Unable to create GPS log file: %1.</source>
+        <translation>Nem tudok GPS naplófáljt készíteni: %1.</translation>
     </message>
 </context>
 <context>
     <name>QGPSMainWindowUI</name>
     <message>
+        <location filename="../src/GPS/qgpsmainwindowui.ui" line="14"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="22"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="29"/>
         <source>TextLabel</source>
@@ -6319,11 +6339,6 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <source>Latitude</source>
         <translation>Szélesség</translation>
     </message>
-    <message>
-        <location filename="../src/GPS/qgpsmainwindowui.ui" line="14"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -6336,92 +6351,136 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Eltávolít</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Alkalmaz</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Mégsem</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished">Fent</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished">Lent</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6439,7 +6498,15 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
+        <source>...</source>
+        <translation>…</translation>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
@@ -6449,25 +6516,17 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
-        <source>...</source>
-        <translation>…</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6495,17 +6554,17 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6549,19 +6608,19 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <translation>Név</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Az</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Az</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6575,12 +6634,12 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Bezár</translation>
     </message>
@@ -6604,6 +6663,16 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>Feltöltés Openstreetmapra</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation>Kérem fűzzön megjegyzést e változásokhoz.</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>Kérem figyelmesen tekintse át az OSM-nek küldött változásokat</translation>
@@ -6618,16 +6687,6 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <source>Cancel</source>
         <translation>Mégsem</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Feltöltés Openstreetmapra</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Kérem fűzzön megjegyzést e változásokhoz.</translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
@@ -6652,51 +6711,6 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <translation>Név:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
-        <source>Projection:</source>
-        <translation>Leképezés:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
-        <source>Tile size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
-        <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
-        <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
-        <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
-        <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
-        <source>Apply</source>
-        <translation>Alkalmaz</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="296"/>
-        <source>Add</source>
-        <translation>Hozzáad</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="303"/>
-        <source>Remove</source>
-        <translation>Eltávolít</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="99"/>
         <source>Server Url:</source>
         <translation>Szolgáló-URL:</translation>
@@ -6716,7 +6730,7 @@ Kérem válasszon más nevet, vagy kattintson az <Alkalmaz> gombra, ha a m
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6725,6 +6739,11 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Ez &#8222;szabványos&#8221; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a>-szolgáló</span></p></body></html></translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
+        <source>Projection:</source>
+        <translation>Leképezés:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
         <source>Mercator (EPSG:900913)</source>
         <translation>Mercator (EPSG:900913)</translation>
@@ -6740,24 +6759,58 @@ p, li { white-space: pre-wrap; }
         <translation>Bal alsó középpont</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
+        <source>Tile size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
+        <source>Min zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
+        <source>Max zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
+        <source>"source" tag value:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
+        <source>License URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
+        <source>Apply</source>
+        <translation>Alkalmaz</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="296"/>
+        <source>Add</source>
+        <translation>Hozzáad</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="303"/>
+        <source>Remove</source>
+        <translation>Eltávolít</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: tájékozódás szolgáltatásokról</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Cím és ösvény nem lehet üres.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Sikertelen letöltés: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Hiba szolgáltatásokat olvasván.
@@ -6779,7 +6832,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TagModel.h" line="22"/>
         <source>Edit this to add...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6792,17 +6845,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
         <source>AND</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6812,12 +6865,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6841,93 +6894,93 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
         <source>For example "1-9;15-17;19,19A"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
         <source>All numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
         <source>Extract - %1</source>
         <translation>Kivonat – %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation>nyomvonal szakaszok száma</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Teljes távolság</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Teljes időtartam</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
@@ -6935,17 +6988,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Rajzoló réteg kivonata</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Nagyít</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Bezár</translation>
     </message>
@@ -6985,17 +7038,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7044,12 +7097,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Nagyít</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Töröl</translation>
     </message>
@@ -7057,35 +7110,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: képességek tudakolása</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Cím és ösvény nem lehet üres.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Sikertelen letöltés: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Hiba képességeket olvasván.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>WMS-szolgálók beállítása</translation>
@@ -7106,19 +7130,52 @@ p, li { white-space: pre-wrap; }
         <translation>Név:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>Szolgáló-URL:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>Rétegek:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Ez gyorstárazós WMS-szolgáló (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"&g [...]
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
         <source>Projection:</source>
         <translation>Leképezés:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
+        <source>Tile it</source>
+        <translation>Kicsempézi</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
+        <source>Zoom levels</source>
+        <translation>Nagyítószintek</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
         <source>Image format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
@@ -7128,12 +7185,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7151,37 +7208,33 @@ p, li { white-space: pre-wrap; }
         <translation>Eltávolít</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>Szolgáló-URL:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: képességek tudakolása</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Cím és ösvény nem lehet üres.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Ez gyorstárazós WMS-szolgáló (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"&g [...]
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Hiba képességeket olvasván.
+</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
-        <source>Tile it</source>
-        <translation>Kicsempézi</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Sikertelen letöltés: %1.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
-        <source>Zoom levels</source>
-        <translation>Nagyítószintek</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_pl.ts b/translations/merkaartor_id_ID.ts
similarity index 63%
copy from translations/merkaartor_pl.ts
copy to translations/merkaartor_id_ID.ts
index 4601ea1..57c7bc7 100644
--- a/translations/merkaartor_pl.ts
+++ b/translations/merkaartor_id_ID.ts
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="id_ID" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="14"/>
         <source>About Merkaartor</source>
-        <translation>Informacje o Merkaartor</translation>
+        <translation>Tentang Merkaartor</translation>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="30"/>
@@ -15,13 +13,25 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Wersja Merkaartora</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></translation>
+<html>
+  <head>
+    <meta name="qrichtext" content="1"/>
+    <style type="text/css">
+      p, li {white-space: pre-wrap; }
+    </style>
+  </head>
+  <body style="font-size:small; font-weight:400; font-style:normal;">
+    <p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">
+      <span style="font-size:small; font-style:italic;">Versi Merkaartor</span>
+      <span style="font-size:8pt;"></span>
+    </p>
+    <p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">
+      <span style="font-size:small; font-weight:600;">%1</span>
+    </p>
+  </body>
+</html></translation>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -35,11 +45,11 @@ p, li { white-space: pre-wrap; }
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Wersja QT</span> </p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (zbudowane przez <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Versi Qt</span> </p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -49,10 +59,10 @@ p, li { white-space: pre-wrap; }
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Wersja PROJ4</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Versi PROJ4 </span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -62,29 +72,29 @@ p, li { white-space: pre-wrap; }
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Wersja GDAL</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Versi GDAL</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
-        <translation>Etykieta tekstowa</translation>
+        <translation>TextLabel</translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Prawa autorskie Bart Vanhauwaert, Chris Browet i inni, 2006-2012</translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation>Hak Cipta Bart Vanhauwaert, Chris Browet, Ladislav Láska dan lainnya, 2006-2015</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Ten program jest objęty licencją GNU Public License v2</translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Program ini terlisensi dibawah GNU General Public License v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -93,12 +103,12 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
-        <translation>Lista zmian</translation>
+        <translation>Catatan Perubahan</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -106,90 +116,120 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
-        <translation>Opis</translation>
+        <translation>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
-        <translation>Skrót klawiszowy</translation>
+        <translation>Pintasan</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
-        <translation>&Importuj</translation>
+        <translation>&Impor</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
-        <translation>&Eksportuj</translation>
+        <translation>&Ekspor</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
-        <translation>&Domyślne</translation>
+        <translation>&Standar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
-        <translation>&Anuluj</translation>
+        <translation>&Batal</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
-        <translation>Edytor skrótów klawiszowych</translation>
+        <translation>Pintasan Editor</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
-        <translation>Otwórz schemat skrótów klawiszowych</translation>
+        <translation>Muat Skema Pintasan</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
-        <translation>Schemat skrótów klawiszowych Merkaartora (*.mss)</translation>
+        <translation>Skema pintasan Merkaartor (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
-        <translation>Nie można otworzyć pliku</translation>
+        <translation>Gagal membuka berkas</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
-        <translation>%1 nie mógł zostać otwarty.</translation>
+        <translation>%1 tidak dapat dibuka.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
-        <translation>Zapisz schemat skrótów klawiszowych</translation>
+        <translation>Simpan skema Pintasan</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
-        <translation>bez nazwy</translation>
+        <translation>Tanpa Judul</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
-        <translation>Wszystkie Pliki (*)</translation>
+        <translation>Semua Berkas (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
-        <translation>Nie można otworzyć pliku do zapisu</translation>
+        <translation>Tidak dapat membuka berkas simpanan</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
-        <translation>%1 nie mógł zostać otwarty do zapisu.</translation>
+        <translation>%1 tidak dapat dibuka untuk diubah</translation>
+    </message>
+</context>
+<context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation>BridgeBuilder</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation>Maaf, saya tidak tahu cara membangun jembatan dari ITU. Silahkan, berikan saya dua titik saja.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation>Konversi ruas ke jembatan</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation>Ruas yang dipilih sudah ditandai sebagai jembatan/terowongan. Silahkan, pastikan anda tahu apa yang anda lakukan.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation>Tindakan tidak didukung: Jembatan tidak terlihat seperti satu arah.</translation>
     </message>
 </context>
 <context>
@@ -197,7 +237,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
         <source>No description</source>
-        <translation>Brak opisu</translation>
+        <translation>Tidak ada penjelasan</translation>
     </message>
 </context>
 <context>
@@ -205,17 +245,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="13"/>
         <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation>Bentuk</translation>
     </message>
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="25"/>
         <source>Driving at the right side of the road</source>
-        <translation>Ruch prawostronny</translation>
+        <translation>Berkendara pada posisi yang benar di jalan</translation>
     </message>
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="40"/>
         <source>Distance between two roads</source>
-        <translation>Odstęp między dwiema drogami</translation>
+        <translation>Jarak antar dua jalan</translation>
     </message>
 </context>
 <context>
@@ -223,12 +263,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="13"/>
         <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation>Bentuk</translation>
     </message>
     <message>
         <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="25"/>
         <source>Driving at the right side of the road</source>
-        <translation>Ruch prawostronny</translation>
+        <translation>Berkendara pada posisi yang benar di jalan</translation>
     </message>
 </context>
 <context>
@@ -236,36 +276,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation><b>Brak</b> zmian</translation>
+        <translation>Disana <b>tidak ada</b> objek kotor</translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation><b>Jeden</b> obiekt zmieniono</translation>
+        <translation>Ada <b>satu</b> objek kotor</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform>Ruszano <b>%n</b> element</numerusform>
-            <numerusform>Ruszano <b>%n</b> elementy</numerusform>
-            <numerusform>Ruszano <b>%n</b> elementów</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
         <source>Undo</source>
-        <translation>Cofnij</translation>
+        <translation>Kembalikan</translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="195"/>
         <source>Center map</source>
-        <translation>Wyśrodkuj mapę</translation>
+        <translation>Tengah peta</translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="196"/>
         <source>Center && Zoom map</source>
-        <translation>Wyśrodkuj i powiększ mapę</translation>
+        <translation>Tengah && Perbesar peta</translation>
     </message>
 </context>
 <context>
@@ -273,33 +309,33 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="14"/>
         <source>Undo</source>
-        <translation>Cofnij</translation>
+        <translation>Kembalikan</translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="37"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Brak</span> zmiam</p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Disana <span style=" font-weight:600;">tidak ada</span> objek kotor</p></body></html></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
         <source>Cleanup</source>
-        <translation>Czyszczenie</translation>
+        <translation>Bersihkan</translation>
     </message>
 </context>
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
-        <translation>Powiększ</translation>
+        <translation>Perbesar</translation>
     </message>
 </context>
 <context>
@@ -308,97 +344,97 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="326"/>
         <location filename="../src/Sync/DirtyList.cpp" line="570"/>
         <source>ADD road %1</source>
-        <translation>DODAJ drogę %1</translation>
+        <translation>MENAMBAH jalan %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="334"/>
         <location filename="../src/Sync/DirtyList.cpp" line="604"/>
         <source>ADD trackpoint %1</source>
-        <translation>DODAJ punkt trasy %1</translation>
+        <translation>MENAMBAH trackpoint %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="342"/>
         <location filename="../src/Sync/DirtyList.cpp" line="537"/>
         <source>ADD relation %1</source>
-        <translation>DODAJ relację %1</translation>
+        <translation>MENAMBAH relasi %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="350"/>
         <location filename="../src/Sync/DirtyList.cpp" line="701"/>
         <source>UPDATE trackpoint %1</source>
-        <translation>AKTUALIZUJ punkt trasy %1</translation>
+        <translation>MENGUBAH trackpoint %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="358"/>
         <location filename="../src/Sync/DirtyList.cpp" line="639"/>
         <source>UPDATE relation %1</source>
-        <translation>AKTUALIZUJ relację %1</translation>
+        <translation>MENGUBAH relasi %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="366"/>
         <location filename="../src/Sync/DirtyList.cpp" line="670"/>
         <source>UPDATE road %1</source>
-        <translation>AKTUALIZUJ drogę %1</translation>
+        <translation>MENGUBAH jalan %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="374"/>
         <location filename="../src/Sync/DirtyList.cpp" line="734"/>
         <source>REMOVE trackpoint %1</source>
-        <translation>USUŃ punkt trasy %1</translation>
+        <translation>MENGHAPUS trackpoint %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="382"/>
         <location filename="../src/Sync/DirtyList.cpp" line="761"/>
         <source>REMOVE road %1</source>
-        <translation>USUŃ drogę %1</translation>
+        <translation>MENGHAPUS jalan %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="390"/>
         <location filename="../src/Sync/DirtyList.cpp" line="788"/>
         <source>REMOVE relation %1</source>
-        <translation>USUŃ relację %1</translation>
+        <translation>MENGHAPUS relasi %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="423"/>
         <location filename="../src/Sync/DirtyList.cpp" line="430"/>
         <location filename="../src/Sync/DirtyList.cpp" line="446"/>
         <source>Error uploading request</source>
-        <translation>Błąd podczas wysyłania</translation>
+        <translation>Kesalahan permintaan unggah</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="424"/>
         <source>Please check your username and password in the Preferences menu</source>
-        <translation>Proszę sprawdzić nazwę użytkownika oraz hasło w ustawieniach</translation>
+        <translation>Silahkan konfirmasi username dan kata kunci pada menu Preferensi</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="427"/>
         <location filename="../src/Sync/DirtyList.cpp" line="447"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation>Wystąpił błąd podczas wysyłania zapytania (%1).
-Serwer odpowiedział: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
-        <source>OPEN changeset</source>
-        <translation>OTWÓRZ zestaw zmian</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
-        <source>CLOSE changeset</source>
-        <translation>ZAMKNIJ zestaw zmian</translation>
+        <translation>Ada kesalahan mengunggah permintaan (%1)
+Pesan server adalah '%2'</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
         <source>
 API message is '%1'</source>
         <translation>
-Komunikat API "%1"</translation>
+Pesan API adalah '%1'</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="464"/>
         <source>Uploading changes...</source>
-        <translation>Wysyłanie zmian...</translation>
+        <translation>Mengunggah perubahan...</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
+        <source>OPEN changeset</source>
+        <translation>MEMBUKA set perubahan</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
+        <source>CLOSE changeset</source>
+        <translation>MENUTUP set perubahan</translation>
     </message>
 </context>
 <context>
@@ -408,191 +444,191 @@ Komunikat API "%1"</translation>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="71"/>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="85"/>
         <source>Error uploading request</source>
-        <translation>Błąd podczas wysyłania</translation>
+        <translation>Kesalahan permintaan unggah</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="65"/>
         <source>Please check your username and password in the Preferences menu</source>
-        <translation>Proszę sprawdzić nazwę użytkownika oraz hasło w ustawieniach</translation>
+        <translation>Silahkan konfirmasi username dan kata kunci pada menu Preferensi</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="68"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation>Wystąpił błąd podczas wysyłania zapytania (%1).
-Serwer odpowiedział: %2</translation>
+        <translation>Ada kesalahan mengunggah permintaan (%1)
+Pesan server adalah '%2'</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="70"/>
         <source>
 API message is '%1'</source>
         <translation>
-Komunikat API "%1"</translation>
+Pesan API adalah '%1'</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="86"/>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation>Wystąpił błąd podczas wysyłania żądania (%1)
-„%2”
-Proszę ponownie pobrać żeby rozwiązać kolizję.</translation>
+        <translation>Ada kesalahan mengunggah permintaan (%1)
+"%2"
+Silahkan unduh-ulang fasilitas permasalahan untuk mengatasi hal ini.</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
         <source>Checking changes...</source>
-        <translation>Sprawdzanie zmian…</translation>
+        <translation>Memeriksa perubahan...</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="184"/>
         <source>OPEN changeset</source>
-        <translation>OTWÓRZ zestaw zmian</translation>
+        <translation>MEMBUKA set perubahan</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="301"/>
         <source>CLOSE changeset</source>
-        <translation>ZAMKNIJ zestaw zmian</translation>
+        <translation>MENUTUP set perubahan</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="354"/>
         <source>ADD relation %1</source>
-        <translation>DODAJ relację %1</translation>
+        <translation>MENAMBAH relasi %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="368"/>
         <source>ADD road %1</source>
-        <translation>DODAJ drogę %1</translation>
+        <translation>MENAMBAH jalan %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="383"/>
         <source>ADD trackpoint %1</source>
-        <translation>DODAJ punkt trasy %1</translation>
+        <translation>MENAMBAH trackpoint %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="399"/>
         <source>UPDATE relation %1</source>
-        <translation>AKTUALIZUJ relację %1</translation>
+        <translation>MENGUBAH relasi %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="414"/>
         <source>UPDATE road %1</source>
-        <translation>AKTUALIZUJ drogę %1</translation>
+        <translation>MENGUBAH jalan %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="428"/>
         <source>UPDATE trackpoint %1</source>
-        <translation>AKTUALIZUJ punkt trasy %1</translation>
+        <translation>MENGUBAH trackpoint %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="442"/>
         <source>REMOVE trackpoint %1</source>
-        <translation>USUŃ punkt trasy %1</translation>
+        <translation>MENGHAPUS trackpoint %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="456"/>
         <source>REMOVE road %1</source>
-        <translation>USUŃ drogę %1</translation>
+        <translation>MENGHAPUS jalan %1</translation>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="470"/>
         <source>REMOVE relation %1</source>
-        <translation>USUŃ relację %1</translation>
+        <translation>MENGHAPUS relasi %1</translation>
     </message>
 </context>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
-        <translation>bez nazwy</translation>
+        <translation>Tanpa Judul</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
-        <translation>Warstwa robocza</translation>
+        <translation>Lapisan kotor</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
-        <translation>Wysłana warstwa</translation>
+        <translation>Lapisan terunggah</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
-        <translation>Obrazy tła</translation>
+        <translation>Latar pembanding</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation>Warstwa rysunku #%1</translation>
+        <translation>Menggambar lapisan #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation>Warstwa filtrująca #%1</translation>
+        <translation>Seleksi lapisan #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
-        <translation>Eksport OSM</translation>
+        <translation>Ekspor OSM</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
-        <translation>Eksportowanie w formacie OSM…</translation>
+        <translation>Mengekspor OSM...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation>Dokument</translation>
+        <translation>Dokumen</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation>Odtwarzanie historii: utwórz węzeł %1</translation>
+        <translation>Sejarah pembangunan: Membuat titik %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation>Odtwarzanie historii: usuń węzeł %1</translation>
+        <translation>Sejarah pembangunan: Mengubah titik %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation>Odtwarzanie historii: usuń węzeł %1</translation>
+        <translation>Sejarah pembangunan: Menghapus titik %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation>Odtwarzanie historii: utwórz drogę %1</translation>
+        <translation>Sejarah pembangunan: Membuat jalan %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation>Odtwarzanie historii: aktualizuj drogę %1</translation>
+        <translation>Sejarah pembangunan: Mengubah jalan %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation>Odtwarzanie historii: usuń drogę %1</translation>
+        <translation>Sejarah pembangunan: Menghapus jalan %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation>Odtwarzanie historii: utwórz powiązanie %1</translation>
+        <translation>Sejarah pembangunan: Membuat relasi %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation>Odtwarzanie historii: aktualizuj powiązanie %1</translation>
+        <translation>Sejarah pembangunan: Mengubah relasi %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation>Odtwarzanie historii: usuń powiązanie %1</translation>
+        <translation>Sejarah pembangunan: Menghapus relasi %1</translation>
     </message>
 </context>
 <context>
@@ -600,260 +636,246 @@ Proszę ponownie pobrać żeby rozwiązać kolizję.</translation>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="14"/>
         <source>Download</source>
-        <translation>Pobierz</translation>
+        <translation>Unduh</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="32"/>
         <source>Location</source>
-        <translation>Położenie</translation>
+        <translation>Lokasi</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="40"/>
         <source>Bookmark</source>
-        <translation>Zakładka</translation>
+        <translation>Tandai</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="62"/>
         <source>Current view</source>
-        <translation>Aktualny widok</translation>
+        <translation>Pandangan saat ini</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation>Łącze WWW (mapy OSM/Google)</translation>
+        <translation>Tautan WWW (OSM/Google maps)</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation>Wybieranie Xapi</translation>
+        <translation>Pemilih Xapi</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
         <source>From the map below (map provided by the OpenStreetMap project)</source>
-        <translation>Użyj poniższej mapy (zapewnianej przez projekt OpenStreetMap)</translation>
+        <translation>Dari peta dibawah (map disediakan oleh proyek OpenStreetMap)</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="112"/>
         <source>Also download raw GPS tracks</source>
-        <translation>Pobieranie ścieżek GPS</translation>
+        <translation>Unduh juga jalur GPS mentah</translation>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="119"/>
         <source>Resolve all relations</source>
-        <translation>Rozwiązywanie wszystkich relacji</translation>
+        <translation>Perbaiki semua relasi</translation>
     </message>
 </context>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Błąd podczas pobierania</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>Unduh %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>błąd</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Pengunduhan tidak dapat diselesaikan</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>Nie pobrano wystarczającej ilości danych</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation>
-            <numerusform>Pobieranie z OSM (%n bajt)</numerusform>
-            <numerusform>Pobieranie z OSM (%n bajty)</numerusform>
-            <numerusform>Pobieranie z OSM (%n bajtów)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation>
-            <numerusform>Pobieranie z OSM (%n kilobajt)</numerusform>
-            <numerusform>Pobieranie z OSM (%n kilobajty)</numerusform>
-            <numerusform>Pobieranie z OSM (%n kilobajtów)</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Pengunduhan tidak selesai %1 dari %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Pobieranie z OSM (łączenie)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Mengurai permasalahan %1 dari %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Nazwa użytkownika lub hasło niepoprawne.</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Menguraikan...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Nierozwiązane konflikty</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>Mengurai XML</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Proszę najpierw rozwiązać wszystkie istniejące kolizje</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Konflik dari %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Pobieranie punktów trasy %1-%2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Jalan/relasi kosong terdeteksi</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Pobranu trasę - węzły %1-%2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Jalan/relasi kosong mungkin keliru. 
+Anda mau menandai untuk dihapuskan?</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation>MapDust</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Menghapus ciri kosong %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>Konflik telah terdeteksi</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Pobieranie punktów</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation>Maksudnya ciri yang sudah anda ubah sejak terakhir unduh telah diubah oleh orang lain di server.
+Cirinya telah terduplikasi sebagai "konflik_..." pada lapisan "Konflik...".
+Sebelum benar-benar mengunggah perubahan, anda harus menggabungkan secara manual kedua versi tersebut dan menghapus salah satunya dari lapisan "Konflik...".</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>Pobranie %1</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Mengunggah...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Pobieranie zależności %1 z %2</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Menyiapkan perubahan</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Przetwarzanie zależności %1 z %2</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Menunggu respon dari server</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>Przetwarzanie XML</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>kesalahan</translation>
     </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Kolizje w %1</translation>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>Znaleziono kolizje</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Mengunduh...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation>Oznacza to, że niektóre z cech, które zostały edytowane od ostatniego pobrania danych zostały zmodyfikowane na serwerze przez kogoś innego.
-Cechy te zostały zduplikowane jako "conflict_..." na warstwie "Konflikty...".
-Zanim będzie można wysłać zmiany na serwer, należy ręcznie scalić obie wersje i usunąć je z warstwy "Konflikty...".</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Mengunduh dari OSM (menyambungkan)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Wykrytu puste drogi lub relacje</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation>Kode status http tak terduga (%1)
+Pesan servernya '%2'</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Puste drogi lub relacje są prawdopodobnie błędami.
-Czy zaznaczyć je do usunięcia?</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation>Pesan API-nya '%1'</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Usuwa pustą cechę %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Gagal unduh</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Pobieranie %1,%2 (powiększenie %3)...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Username/password tidak sah</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation>Niespodziewany kod zwrotny http (%1)
-Komunikat serwera brzmi: %2</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Konflik yang tidak bisa diperbaiki</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation>
-Komunikat API "%1"</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Silahkan perbaiki konflik yang ada terlebih dahulu</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Pobieranie...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Mengunduh trackpoint %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Parsowanie...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Mengunduh jalur - titik %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Pobieranie brakujących członków...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation>MapDust</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Wysyłanie…</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Mengunduh titik</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Przygotowywanie zmian</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Oczekiwanie na odpowiedź serwera</translation>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Mengunduh %1,%2 (perbesaran %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Zamknij</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
+        <source>Zoom</source>
+        <translation>Perbesaran</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
-        <source>Zoom</source>
-        <translation>Powiększ</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Tutup</translation>
     </message>
 </context>
 <context>
@@ -861,34 +883,33 @@ Komunikat API "%1"</translation>
     <message>
         <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation>Nie można usunąć</translation>
+        <translation>Tidak dapat dihapus</translation>
     </message>
     <message>
         <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation>Nie można wusunąć zaznaczenia, gdyż mieści się ono poza pobranym obszarem.</translation>
+        <translation>Tidak dapat menghapus yang terpilih karena diluar area unduhan.</translation>
     </message>
     <message>
         <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation>Nie możn usunąć wszystkiego</translation>
+        <translation>Tidak dapat menghapus apapun</translation>
     </message>
     <message>
         <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation>Nie można usunąć całego zaznaczenia, gdyż część mieści się poza pobranym obszarem.
-Czy usunąć co się da?</translation>
+        <translation>Objek terpilih yang telah lengkap tidak dapat dihapus karena bagiannya ada di luar area unduh. Hapus yang mungkin saja?</translation>
     </message>
     <message>
         <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation>Odwróć drogę %1</translation>
+        <translation>Balikan jalan %1</translation>
     </message>
     <message>
         <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation>Odwróć %1 dróg</translation>
+        <translation>Membalikan %1 jalan</translation>
     </message>
 </context>
 <context>
@@ -896,27 +917,27 @@ Czy usunąć co się da?</translation>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="13"/>
         <source>Export</source>
-        <translation>Eksportowanie</translation>
+        <translation>Ekspor</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="25"/>
         <source>What do you want to export?</source>
-        <translation>Co wyeksportować?</translation>
+        <translation>Apa yang ingin anda ekspor?</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="38"/>
         <source>All visible (i.e. not hidden)</source>
-        <translation>Wszystkie widoczne warstwy</translation>
+        <translation>Tampilkan semua (contoh, tidak disembunyikan)</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="45"/>
         <source>Viewport</source>
-        <translation>Aktualny widok</translation>
+        <translation>Sudut-pandang</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="52"/>
         <source>Selected</source>
-        <translation>Zaznaczone</translation>
+        <translation>Terpilih</translation>
     </message>
 </context>
 <context>
@@ -924,52 +945,52 @@ Czy usunąć co się da?</translation>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="430"/>
         <source>Features</source>
-        <translation>Cechy</translation>
+        <translation>Ciri</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="431"/>
         <source>Center map</source>
-        <translation>Wyśrodkuj mapę</translation>
+        <translation>Tengah peta</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="432"/>
         <source>Center && Zoom map</source>
-        <translation>Wyśrodkuj i powiększ mapę</translation>
+        <translation>Tengah && Perbesar peta</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="433"/>
         <source>Download missing children</source>
-        <translation>Pobierz brakujących członków</translation>
+        <translation>Unduh anak yang hilang</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Tambahkan ke yang terpilih</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
-        <translation>Usuń</translation>
+        <translation>Hapus</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="442"/>
         <source>Relations</source>
-        <translation>Relacje</translation>
+        <translation>Relasi</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="443"/>
         <source>Roads</source>
-        <translation>Drogi</translation>
+        <translation>Jalan</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="444"/>
         <source>POI's</source>
-        <translation>Miejsca</translation>
+        <translation>POI</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="445"/>
         <source>All</source>
-        <translation>Wszystkie</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Dodaj do zaznaczenia</translation>
+        <translation>Semua</translation>
     </message>
 </context>
 <context>
@@ -977,22 +998,22 @@ Czy usunąć co się da?</translation>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="14"/>
         <source>Features</source>
-        <translation>Cechy</translation>
+        <translation>Ciri</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="72"/>
         <source>Only features fully within the viewport</source>
-        <translation>Tylko cechy znajdujące się w widoku</translation>
+        <translation>Hanya ciri penuh yang ada pada sudut-pandang</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
         <source>Find...</source>
-        <translation>Szukaj...</translation>
+        <translation>Cari...</translation>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation>Przeładować</translation>
+        <translation>Ulang</translation>
     </message>
 </context>
 <context>
@@ -1000,17 +1021,17 @@ Czy usunąć co się da?</translation>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation>Okno dialogowe</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="20"/>
         <source>Name</source>
-        <translation>Nazwa</translation>
+        <translation>Nama</translation>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="30"/>
         <source>Filter</source>
-        <translation>Filtr</translation>
+        <translation>Saring</translation>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
@@ -1021,9 +1042,9 @@ Czy usunąć co się da?</translation>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
-        <translation>Zamknij</translation>
+        <translation>Tutup</translation>
     </message>
 </context>
 <context>
@@ -1031,27 +1052,27 @@ Czy usunąć co się da?</translation>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation>Ustawienia filtrów</translation>
+        <translation>Pengaturan saring</translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
         <source>Filters</source>
-        <translation>Filtry</translation>
+        <translation>Saring</translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="47"/>
         <source>Filter list:</source>
-        <translation>Spis filtrów:</translation>
+        <translation>Daftar saringan:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="76"/>
         <source>Name:</source>
-        <translation>Nazwa:</translation>
+        <translation>Nama:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="93"/>
         <source>Filter</source>
-        <translation>Filtr</translation>
+        <translation>Saring</translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
@@ -1061,582 +1082,483 @@ Czy usunąć co się da?</translation>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="127"/>
         <source>Apply</source>
-        <translation>Zastosuj</translation>
+        <translation>Terapkan</translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="134"/>
         <source>Add</source>
-        <translation>Dodaj</translation>
+        <translation>Tambah</translation>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="141"/>
         <source>Remove</source>
-        <translation>Usuń</translation>
+        <translation>Hapus</translation>
     </message>
 </context>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Jaringan kehabisan waktu</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Tidak dapat membaca rincian foto dari server Walking Papers</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Silahkan perjelas URL Walking Papers</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
-        <translation>Geolokalizowane obrazy</translation>
+        <translation>Gambar geo</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Tengah peta</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
         <translation>c</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
-        <translation>Usuń obrazy</translation>
+        <translation>Hapus gambar</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
-        <translation>Skopiuj nazwę pliku do schowka</translation>
+        <translation>Saling nama berkas ke clipboard</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Pilih gambar berikutnya</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>PgDown</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Pilih gambar sebelumnya</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>PgUp</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Simpan gambar geotag</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Lapisan foto</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
-        <translation>Wczytaj geolokalizowane obrazy</translation>
+        <translation>Memuat gambar geotag</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
-        <translation>Warstwa, na której powinny się znajdować obrazy:</translation>
+        <translation>Pilih lapisan yang akan diacu oleh gambar:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
-        <translation>Warstwa tylko do odczytu</translation>
+        <translation>Lapisan hanya baca-saja</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
-        <translation>Używana warstwa nie może być zapisana. Czy zmienić ją na zapisywalną?
-Jeśli nie, to nie można załadować należących do niej obrazów.</translation>
+        <translation>Lapisan yang digunakan tidak dapat diubah. Jadikan dapat diubah? 
+Jika tidak, anda tidak dapat memuat gambarnya.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
-        <translation>Wczytywanie obrazów...</translation>
+        <translation>Memuat gambar...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
-        <translation>Przerwij wczytywanie</translation>
+        <translation>Gagalkan pemuatan</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>Tidak ada berkas</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>Tidak dapat menemukan gambar "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>Kesalahan ketika membuka "%2": 
+%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Kesalahan ketika membuka data EXIF dari "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
-        <translation>Podaj przesunięcie</translation>
+        <translation>Tentukan penyeimbang</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
-        <translation>Ustaw obrazy bliżej:</translation>
+        <translation>Tempatkan gambar lebih ke:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
-        <translation>końca ścieżki</translation>
+        <translation>akhir jalan.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
-        <translation>początku ścieżki</translation>
+        <translation>awal jalan.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Tidak ada TrackPoints</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Tidak ada TrackPoints yang ditemukan untuk gambar "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
-        <translation>ss 'sekund'</translation>
+        <translation>ss 'detik'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
-        <translation>mm 'minut' i ss 'sekund'</translation>
+        <translation>mm 'menit dan' ss 'detik</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
-        <translation>hh godzin, mm minut i ss sekund</translation>
+        <translation>hh 'jam', mm 'menit dan' ss 'detik'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
-        <translation>Błędny obraz?</translation>
+        <translation>Gambar salah?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
-        <translation>Obraz %1 został wykonany %2 zanim następny punkt trasy został zapisany.
-Czy na pewno go wykorzystać?</translation>
+        <translation>Gambar "%1" telah diambil %2 sebelum trackpoint berikutnya direkam.
+Amda ingin tetap menggunakannya?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
-        <translation>Obraz %1 został wykonany %2 po zapisaniu ostatniego punktu trasy.
-Czy na pewno go wykorzystać?</translation>
+        <translation>Gambar "%1" telah diambil %2 setelah trackpoint terakhir direkam.
+Anda tetap ingin menggunakannya?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>Nie ma takiego pliku</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation>Tetapkan nama berkas keluaran</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Przekroczono limit czasu połączenia</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation>Gambar JPEG (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Nie można wczytać informacji o obrazie z serwera Walking Papers.</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <source>Error while opening "%1":
+%2</source>
+        <translation>Kesalahan ketika membuka "%1":
+%2</translation>
     </message>
+</context>
+<context>
+    <name>GotoDialog</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Proszę podać adres URL z serwisu Walking Papers</translation>
+        <location filename="../src/common/GotoDialog.ui" line="14"/>
+        <source>Go To</source>
+        <translation>Menuju ke</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>Adres URL:</translation>
+        <location filename="../src/common/GotoDialog.ui" line="28"/>
+        <source>Bookmark</source>
+        <translation>Tandai</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Wyśrodkuj mapę</translation>
+        <location filename="../src/common/GotoDialog.ui" line="61"/>
+        <source>WWW link (OSM/Google maps)</source>
+        <translation>Link WWW (peta OSM/Google)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Zapisz geotagowany obraz…</translation>
+        <location filename="../src/common/GotoDialog.ui" line="80"/>
+        <source>Coordinates</source>
+        <translation>Koordinat</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Warstwa obrazów:</translation>
+        <location filename="../src/common/GotoDialog.ui" line="92"/>
+        <source>Show projected</source>
+        <translation>Perlihatkan proyeksi</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>Nie można znaleźć obrazu %1.</translation>
+        <location filename="../src/common/GotoDialog.ui" line="107"/>
+        <source>lonMin, latMin, lonMax, latMax</source>
+        <translation>bujur-Min, lintang-Min, bujur-Max, lintang-Max</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
+        <location filename="../src/common/GotoDialog.ui" line="134"/>
+        <source>latCent, lonCent, latSpan, lonSpan</source>
+        <translation>lintang-Tengah, bujur-Tengah, lintang-Jeda, bujur-Jeda</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>Błąd podczas otwierania %2:
-%1</translation>
+        <location filename="../src/common/GotoDialog.ui" line="156"/>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Brak punktów trasy</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Nie znaleziono żadnego punktu trasy dla obrazu %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation>Obrazy JPEG (*.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Błąd podczas wczytywanie danych EXIF z %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation>Podaj nazwę pliku wyjściowego</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <source>Error while opening "%1":
-%2</source>
-        <translation>Błąd podczas otwierania "%1":
-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Wybierz następny obraz</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>PageDown</translation>
+        <location filename="../src/common/GotoDialog.ui" line="176"/>
+        <source>OSM API Url</source>
+        <translation>Url API OSM</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Wybierz poprzedni obraz</translation>
+        <location filename="../src/common/GotoDialog.ui" line="203"/>
+        <source>OSM XAPI url</source>
+        <translation>Url XAPI OSM</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>PageUp</translation>
+        <location filename="../src/common/GotoDialog.ui" line="225"/>
+        <location filename="../src/common/GotoDialog.ui" line="244"/>
+        <source>Search</source>
+        <translation>Cari</translation>
     </message>
-</context>
-<context>
-    <name>GotoDialog</name>
     <message>
         <location filename="../src/common/GotoDialog.cpp" line="97"/>
         <source>Invalid OSM url</source>
-        <translation>Błędny adres OSM</translation>
+        <translation>Url OSM salah</translation>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.cpp" line="98"/>
         <source>The specified url is invalid!</source>
-        <translation>Podany adres jest nieprawidłowy!</translation>
+        <translation>Url yang ditetapkan salah!</translation>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.cpp" line="106"/>
         <location filename="../src/common/GotoDialog.cpp" line="117"/>
         <source>Invalid Coordinates format</source>
-        <translation>Błędny format współrzędnych</translation>
+        <translation>Bentuk Koordinat salah</translation>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.cpp" line="107"/>
         <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Współrzędne muszą być w formacie: <lewa wys.>, <dolna szer.>, <prawa wys.>, <górna szer.></translation>
+        <translation>Koordinat harus: '<left lon>, <bottom lat>, <right lon>, <top lat>'</translation>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.cpp" line="118"/>
         <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Współrzędne muszą być w formacie: <środkowa szerokość>, <środkowa wysokość>, <zasięg szerokości>, <zasięg wysokości></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="14"/>
-        <source>Go To</source>
-        <translation>Idź do</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="28"/>
-        <source>Bookmark</source>
-        <translation>Zakładka</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="61"/>
-        <source>WWW link (OSM/Google maps)</source>
-        <translation>Łącze WWW (mapy OSM/Google)</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="80"/>
-        <source>Coordinates</source>
-        <translation>Współrzędne</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="92"/>
-        <source>Show projected</source>
-        <translation>Pokazuj projekcje</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="107"/>
-        <source>lonMin, latMin, lonMax, latMax</source>
-        <translation>min wys., min szer., max wys., max szer.</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="134"/>
-        <source>latCent, lonCent, latSpan, lonSpan</source>
-        <translation>latCent, lonCent, latZas, lonZas</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="156"/>
-        <source>Info</source>
-        <translation>Informacje</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="176"/>
-        <source>OSM API Url</source>
-        <translation>OSM API url</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="203"/>
-        <source>OSM XAPI url</source>
-        <translation>URL OSM XAPI</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="225"/>
-        <location filename="../src/common/GotoDialog.ui" line="244"/>
-        <source>Search</source>
-        <translation>Wyszukaj</translation>
+        <translation>Koordinat harus: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
     </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
-        <translation>Brak</translation>
+        <translation>Tidak ada</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
-        <translation>Adapter kształtu</translation>
+        <translation>Adaptor bentuk</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
-        <translation>Powiększ</translation>
+        <translation>Perbesaran</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation>Ustaw rzut widoku dla warstwy</translation>
+        <translation>Atur tampilan proyeksi ke lapisan</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation>Przywróć dopasowanie ułożenia</translation>
+        <translation>Atur-ulang pengaturan penjajaran</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
-        <translation>Zamknij</translation>
+        <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
-        <translation>Adapter WMS</translation>
+        <translation>Adaptor WMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
-        <translation>Adapter TMS</translation>
+        <translation>Adaptor TMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation>Wtyki</translation>
+        <translation>Plugin</translation>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
-        <translation>Brak mapy</translation>
+        <translation>Peta - Tidak ada</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
-        <translation>Mapa - WMS - %1</translation>
+        <translation>Peta - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
-        <translation>Mapa - WMS-C - %1</translation>
+        <translation>Peta - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
-        <translation>Mapa - WMS-Kafelki - %1</translation>
+        <translation>Peta - Kubus-WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
-        <translation>Mapa - TMS - %1</translation>
+        <translation>Peta - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
-        <translation>Mapa - %1</translation>
+        <translation>Peta - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation>Warunki licencji</translation>
+        <translation>Penjelasan Lisensi: %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation>Nie zaakceptowano warunków licencyjnych</translation>
+        <translation>Pernyataan Lisensi tidak dapat diterima</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation>Nie potwierdziłeś przyjęcia warunków licencji.
-Nie będziesz więc mógł używać tego źródła jako warstwy mapy.
-Czy jesteś pewny że tego chcesz?</translation>
+        <translation>Anda tidak mencentang checkbox yang menunjukkan pernyataan anda terhadap lisensi.
+Jika demikian, anda tidak dapat menggunakan sumber ini sebagai lapisan peta.
+Apakah anda bermaksud demikian?</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation>Serwer</translation>
+        <translation>Penyedia</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
-        <translation>Rozmiar kafla</translation>
+        <translation>Ukuran kubus</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation>Min/Maks powiększenia</translation>
+        <translation>Perbesaran terkecil/terbesar</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
-        <translation>Rzut</translation>
+        <translation>Proyeksi</translation>
     </message>
 </context>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Ciąg znaków</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Liczba całkowita</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Liczba zmiennoprzecinkowa</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Wysokość geograficzna</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Szerokość geograficzna</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Nieprawidłowe odwzorowanie</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Nie można ustawić odwzorowania</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Brak współrzędnych</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Brakuje pól szerokość lub długość geograficzna. Importowanie nie będzie możliwe.
-Zakończyć?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Wczytaj ustawienia importu plików CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Ustawienia importu programu Merkaartor (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Niepoprawny plik</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 nie mógł zostać otwarty.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 nie jest plikiem ustawień importu CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>Zapisz ustawienia importu plików CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>bez nazwy</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Wszystkie Pliki (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>Nie można otworzyć ustawień zapisu importowania</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 nie mógł zostać otwarty do zapisu.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation>Okno dialogowe</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
         <source>Input</source>
-        <translation>Wejście</translation>
+        <translation>Masukkan</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1659,281 +1581,376 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation>Podgląd OSM</translation>
+        <translation>Pratinjau OSM</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
         <source>Specifications</source>
-        <translation>Specyfikacja</translation>
+        <translation>Spesifikasi</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
         <source>First line contains headers</source>
-        <translation>Pierwszy wiersz zawiera nagłówek</translation>
+        <translation>Baris awal mengandung header</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
         <source>Delimiter</source>
-        <translation>Separator</translation>
+        <translation>Pembatas</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
         <source>Colon (,)</source>
-        <translation>Przecinek (,)</translation>
+        <translation>Koma (,)</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="131"/>
         <source>Semicolon (;)</source>
-        <translation>Średnik (;)</translation>
+        <translation>Titik-koma (;)</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="138"/>
         <source>Tab</source>
-        <translation>Tabulator</translation>
+        <translation>Tab</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="145"/>
         <source>Other:</source>
-        <translation>Inne:</translation>
+        <translation>Lainnya:</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation>Cudzysłów ciągu</translation>
+        <translation>Kutipan kata</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
         <source>None</source>
-        <translation>Brak</translation>
+        <translation>Tidak ada</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation>Prosty cytat (')</translation>
+        <translation>Kutip satu (')</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation>Cudzysłów (")</translation>
+        <translation>Kutip ganda (")</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
         <source>Projection (in PROJ4 format; leave blank for latitude/longitude)</source>
-        <translation>Odwzorowanie (w formacie PROJ4; pozostawić puste dla szerokości/wysokości)</translation>
+        <translation>Proyeksi (pada bentuk PROJ4; kosongkan untuk lintang/bujur)</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="227"/>
         <source>Fields</source>
-        <translation>Pola</translation>
+        <translation>Bidang</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="254"/>
         <source>Field list:</source>
-        <translation>Spis pól:</translation>
+        <translation>Daftar bidang:</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation>Nazwa pola (= nazwa etykiety):</translation>
+        <translation>Nama bidang(= label kunci) :</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
         <source>Field Type:</source>
-        <translation>Rodzaj pola:</translation>
+        <translation>Tipe bidang:</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="310"/>
         <source>Import</source>
-        <translation>Importuj</translation>
+        <translation>Impor</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="336"/>
         <source>Import range</source>
-        <translation>Importuj zakres</translation>
+        <translation>Jarak impor</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="342"/>
         <source>From (0 from start):</source>
-        <translation>Od (0 od początku):</translation>
+        <translation>Dari (0 dari mulai):</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="352"/>
         <source>To (0 to End):</source>
-        <translation>Do (0 = koniec)</translation>
+        <translation>ke (0 ke akhir):</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="367"/>
         <source>Load settings...</source>
-        <translation>Wczytaj ustawienia…</translation>
+        <translation>Memuat pengaturan...</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="374"/>
         <source>Save settings...</source>
-        <translation>Zapisz ustawienia…</translation>
+        <translation>Simpan pengaturan...</translation>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
-        <translation>Potwierdzić rzut</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Kata</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
-        <translation>Nie można ustawić rzutu; proszę podać jakiś</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Angka bulat</translation>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
-        <translation>Informacje</translation>
-    </message>
-</context>
-<context>
-    <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n cech</numerusform>
-            <numerusform>%n cechy</numerusform>
-            <numerusform>%n cech</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Pecahan</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
-        <translation>Rozmiar</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Bujur</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
-        <translation>Cechy</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Lintang</translation>
     </message>
-</context>
-<context>
-    <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Warstwy</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Proyeksi salah</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Wszystkie</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Tidak dapat menentukan proyeksi</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>Ścieżki</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Tidak ada koordinat</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
-        <source>Show All</source>
-        <translation>Pokaż wszystkie</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Bidang Lintang atau Bujur hilang. Tidak memungkinkan untuk impor berkas nanti.
+Anda yakin akan keluar?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
-        <source>Hide All</source>
-        <translation>Ukryj wszystkie</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Memuat pengaturan impor CSV</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
-        <source>Readonly All</source>
-        <translation>Tylko do odczytu - wszystko</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Impor pengaturan Merkaartor (*.mis)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
-        <source>Readonly None</source>
-        <translation>Tylko do odczytu - nic</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Berkas salah</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
-        <source>Close</source>
-        <translation>Zamknij</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 tidak dapat dibuka.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="402"/>
-        <source>Map</source>
-        <translation>Mapa</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 bukan berkas pengaturan impor CSV</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="403"/>
-        <source>Draw</source>
-        <translation>Rysuj</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>Simpan pengaturan impor CSV</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation>Przywróć domyślne warstwy</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>tanpa-judul</translation>
     </message>
-</context>
-<context>
-    <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
-        <source>Visible</source>
-        <translation>Widoczna</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Semua berkas (*)</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
-        <source>Low</source>
-        <translation>Niska</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>Tidak dapat membuka pengaturan impor tersimpan</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
-        <source>High</source>
-        <translation>Wysoka</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 tidak dapat dibuka untuk diubah</translation>
+    </message>
+</context>
+<context>
+    <name>ImportExportGdal</name>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation>Konfirmasi proyeksi</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation>Tidak dapat menetapkan proyeksi; silahkan tetapkan satu</translation>
+    </message>
+</context>
+<context>
+    <name>InfoDock</name>
+    <message>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation>Ukuran</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation>%n ciri</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
+        <translation>Ciri</translation>
+    </message>
+</context>
+<context>
+    <name>LayerDock</name>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
+        <source>Show All</source>
+        <translation>Tampilkan semua</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
+        <source>Hide All</source>
+        <translation>Sembunyikan semua</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
+        <source>Readonly All</source>
+        <translation>Baca-saja Semua</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
+        <source>Readonly None</source>
+        <translation>Baca-saja tidak ada</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
+        <source>Close</source>
+        <translation>Tutup</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Lapisan</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Semua</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="402"/>
+        <source>Map</source>
+        <translation>Peta</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="403"/>
+        <source>Draw</source>
+        <translation>Gambar</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>Jalur</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation>Kembalikan Lapisan ke semula</translation>
+    </message>
+</context>
+<context>
+    <name>LayerWidget</name>
+    <message>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Bentuk</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
+        <source>Visible</source>
+        <translation>Nampak</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
+        <source>Readonly</source>
+        <translation>Baca-saja</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
+        <source>Low</source>
+        <translation>Rendah</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
+        <source>High</source>
+        <translation>Tinggi</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
-        <translation>Nieprzeźroczysta</translation>
+        <translation>Buram</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
-        <translation>Nieprzeźroczystość</translation>
+        <translation>Kegelapan</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation>Zamykanie warsty: zmienione objekt są w niej</translation>
+        <translation>Lapisan keluar: objek kotor ada</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation>Ruszano cechy na tej wraste.
-Czy napewno ją zamknąć? (Nie ma możliwości cofnięcia)</translation>
+        <translation>Ada ciri kotor pada lapisan ini.
+Anda yakin akan keluar? (tidak dapat dikembalikan)</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation>Zamykanie warsty: nie jest pusta</translation>
+        <translation>Lapisan keluar: tidak kosong</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation>Czy jesteś pewsien że chcesz zamknąć tą warstwę? (Tej operacji nie można cofnąć)</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
-        <source>Readonly</source>
-        <translation>Tylko do odczytu</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation>Anda yakin menutup lapisan ini? (tidak dapat dikembalikan)</translation>
     </message>
 </context>
 <context>
@@ -1941,17 +1958,17 @@ Czy napewno ją zamknąć? (Nie ma możliwości cofnięcia)</translation>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation>Warunki dostępności</translation>
+        <translation>Penjelasan Lisensi</translation>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation>about:blank</translation>
+        <translation>tentang:kosong</translation>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation>Przeczytałem, i zgadzam się z warunkami licencji</translation>
+        <translation>Saya telah membaca dan menyetujui penjelasan lisensi tersebut</translation>
     </message>
 </context>
 <context>
@@ -1959,2828 +1976,2821 @@ Czy napewno ją zamknąć? (Nie ma możliwości cofnięcia)</translation>
     <message>
         <location filename="../src/Utils/MDiscardableDialog.cpp" line="24"/>
         <source>Don't ask me this again</source>
-        <translation>Nie pytaj o to więcej</translation>
+        <translation>Jangan tanyakan saya ini lagi</translation>
     </message>
 </context>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Ładowanie wtyczek...</translation>
+        <translation>%1 v%2 Memuat plugin</translation>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="248"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Zaczynanie...</translation>
+        <translation>%1 v%2 Memulai...</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Wyczyść znacznik %1 na %2</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Utwórz obszar %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Obszar: Stwórz drogę %1</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Obszar: Zakończ drogę %1</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Pertolongan</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Obszar: Dodaj węzeł %1 do drogi %2</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Membuat</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Jalan</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Ubah</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Dodaj węzły do dwujezdniowej drogi %1</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Pandangan</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Utwórz dwujezdiową drogę %1</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Penanda</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Utwórz węzeł na drodze %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Tetapkan &proyeksi</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Utwórz miejsce %1</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Tetapkan &kegelapan Area</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Utwórz rondo %1</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Berkas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Utwórz węzeł %1 na drodze %2</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Ekspor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Utwórz drogę: %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Buka &Sering</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Utwórz węzeł: %1</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Im&por sering</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Dodaj węzeł %1 do drogi %2</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>Per&alatan</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Zamknąć drogę %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Gaya</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation>Model lab&el</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Titik</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove feature %1</source>
-        <translation>Usuń cechę %1</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Jendela</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
-        <source>Remove features</source>
-        <translation>Usuń cechy</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Wadah</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>Czy usunąć również pochodne węzły?
-Węzły OSM poza pobranym obszarem zostaną zachowane.</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>&Ciri</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
-        <source>Reverse %1 ways</source>
-        <translation>Odwróć %1 dróg</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>kafel %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Lapisan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Właściwości...</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>Plik</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&asi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Edycja</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>&Tampilkan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>Widok</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Tampilkan &Arah panah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>Pokaż</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Baris-alat Utama</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Strzałki kierunkowe</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Keluar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&Tentang</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Warstwy</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Buka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Utwórz</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Buat dokumen baru dan impor berkas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Cecha</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Węzeł</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Perbesar &semua</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Droga</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relacja</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>&Jendela perbesaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Narzędzia</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Jendela perbesaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation>Okna</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Pomoc</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>Per&kecil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Zawartośc schowka jest niepoprawna</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation>Ustawienie Wycinania</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>Per&besar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Schowek nie zawiera poprawnych danych</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Perbesar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>Unsaved changes</source>
-        <translation>Niezapisane zmiany</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>Aktualna mapa zawiera niezapisane zmiany, które zostaną utracone podczas tworzenia nowej.
-Anulować tworzenie nowej mapy czy porzucić poprzednie zmiany?</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Tautan menikung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation>Niezapisany zmiany w stylu</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Kembalikan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation>Dokonano zmian w bierzącym stylu.
-Czy zachować zmiany?</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Punkty pośrednie</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Ulangi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Ścieżka %1</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Brak poprawnego pliku</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Pindah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3350"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 nie mógł zostać otwarty.</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation>Przychodzące zapytanie zdalnego sterowania</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Impor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation>Nieznany url działania: %1</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Impor berkas kedalam dokumen ini</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Wykryto nieaktualną wersję Qt</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Unduh</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Używasz Qt w wersji %1, która zawiera różne znane błędy powodujące zwrot kodów 401 podczas wysyłania danych na serwery OpenStreetMap. Czy chcesz kontynować (nie zalecane)? 
-Więcej informacji znajdziesz na stronie http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Unduh data peta untuk area baru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Wysyłanie do OSM</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Nie podano nazwy użytkownika i hasła do OpenStreetMap.
-Czy chcesz to zrobić teraz?</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Tautan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Błąd podczas pobierania</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Membuat tautan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Nie można pobrać mapy</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Błąd w trakcie pobieranie z serwera OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Pilih</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>Nie można pobrać danych zserwisu OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation>Błąd pobierania MapDust</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Unggah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation>Nie można borać błędów z MapDust</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Unggah perubahan ke penyedia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Połącz drogi</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Podziel drogi</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>&Hapus</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Rozdziel drogi</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Hapus ciri terpilih</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Upraszcza drogę</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Przekroczono limit czasu połączenia</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Membuat jalan baru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Nie można połączyć się z serwerem OpenStreetBugs.</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Błąd w czasie zamykania błędu</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Membuat titik baru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Nie można usunąć błędu. Komunikat serwera:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Dodaje adresy</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Balikan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>Ilość segmentów na które podzielić</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Balikan arah jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation>Podaj islość odcinków</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Pergi ke...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>Podziel drogę na %1</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation>Wyrównywanie osi</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Jalan jalur ganda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation>Podaj liczbę osi do których mają zostać wyrównane kąty (wsz. 4 dla prostokątu)</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Membuat jalan jalur ganda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>trójkątny</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation>&Bundaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>prostokątny</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Membuat Bundaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>pentagonalny</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Baru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>heksagonalny</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Membuat dokumen baru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>heptagonalny</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Bagi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>oktagonalny</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Pecah jalan menjadi beberapa jalan (terhubung)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>Wyrównać do %1 osi</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>Wyrównaj do %1 regularnych osi</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Gabung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation>Niemożna wyrównać osi</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Gabung jalan yang terhubung menjadi satu jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>Wyrównywanie do osi nie powiodło się. Proszę usunąć ostre kąty i spróbować ponownie.</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>Wyrównywanie do osi nie powiodło się i nie znalazło rozwiązania.</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Pisahkan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation>Zacznij wyciągać</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Pisah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation>Rozstaw węzły</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Pisahkan jalan yang terhubung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation>Dodaj do wieloboku</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>Połącz obszary</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&lasi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Podziel obszar</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Membuat Relasi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation>Podziel zakrez na %1</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Utwórz relację %1</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Membuat area baru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Zapisz styl mapy</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Ubah...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Styl map Merkaartor (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Simpan &Sebagai...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Otwórz styl mapy</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Memuat...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Obsługiwane formaty</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>Jalan &menikung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Styl mapty Merkaartoa (*.mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Pengaturan...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation>Arkusz stylu MapCSS (*.css)</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Semua...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation>Zostanie podjęta próba odtworzenia historii.
-Nie ma gwarancji, i nie da się tego cofnąć.
-Czy jesteś pewny że tego chcesz? </translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Export semua lapisan yang terlihat ke berkas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Cari</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Zapisz dokument Merkaartora</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Cari</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3396"/>
-        <location filename="../src/MainWindow.cpp" line="3409"/>
-        <location filename="../src/MainWindow.cpp" line="3438"/>
-        <location filename="../src/MainWindow.cpp" line="3477"/>
-        <location filename="../src/MainWindow.cpp" line="3536"/>
-        <location filename="../src/MainWindow.cpp" line="4278"/>
-        <source>untitled</source>
-        <translation>bez nazwy</translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Cari dan pilih objek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Pliki dokumenty Merkaartora (*.mdc)</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3409"/>
-        <location filename="../src/MainWindow.cpp" line="3438"/>
-        <location filename="../src/MainWindow.cpp" line="3477"/>
-        <location filename="../src/MainWindow.cpp" line="3536"/>
-        <location filename="../src/MainWindow.cpp" line="4278"/>
-        <source>All Files (*)</source>
-        <translation>Wszystkie Pliki (*)</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Pandangan...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>Format GPX (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Expor ciri pada tampilan ke berkas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>Format OpenStreetMap (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Tambah...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>Plik zmian OpenStreetMap (*.osc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Hapus...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Format Noni GPSPlot (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>%Gabung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>Log NMEA (*nmea *nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Gabung Titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>Plik KML (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Gabung titik terpilih (pilihan pertama akan tetap)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Wartości oddzielone przecinkami (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Geolokalizowane obrazy (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Simpan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>Plik kszałtów ESRI (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Simpan ke berkas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation>Język zaznaczania geograficznego (*.gml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation>Postać zero-jedynkowa Protobuf (*.pbf)
-</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Unduh yang lain</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Dokument Merkaartora (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Unduh data peta lain untuk area ini</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Droga</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Unduh tampilan ini ke lapisan unduh sebelumnya</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Wczytaj obraz</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Dodaj pozycję węzła do obrazu</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Sifat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Oznacz obraz bieżącą pozycją</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Sembunyikan/Tampilkan wadah Sifat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Sembunyikan/Tampilkan wadah Lapisan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Info</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Sembunyikan/Tampilkan wadah Info</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Niepoprawny plik</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 nie jest poprawnym dokumentem Merkaartora.</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Meluruskan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Eksportuj w formacie OSM</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Sejajarkan titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>Pliki OpenStreetMap (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Sejajarkan titik terpilih. Dua yang terpilih diawal menggambarkan garis.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Eksportuj w formacie osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>pliki zmian (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>&Penyebaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Eksportuj GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation>Penyebaran titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Pliki GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Sejajarkan dan sebarkan titik terpilih secara seimbang</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exportuj KML</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Sembunyikan/Tampilkan wadah Pengulangan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Plik KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Tampilkan area &unduhan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Salin</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Dodaj zakładkę</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Salin ciri terpilih dan beri label pada clipboard</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Podaj nazwę zakładki.</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Salin label ciri terpilih ke clipboard; jika cirinya adalah sebuah trackpoint, salin koordinatnya juga.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Niepoprawna nazwa zakładki</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Nazwa zakładki nie może być pusta.</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Tempel Label (&Timpa)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Uwaga! Zakładka o tej samej nazwie już istnieje.</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Tempel (dan timpa) label pada clipboard ke sifat terpilih.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Wprowadź nową nazwę, zostaw obecną by nadpisać zakładkę lub anuluj.</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Usuń zakładkę</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Tempel Label (&Gabung)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Wybierz zakładkę do usunięcia.</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Tempel label</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Tempel label dari clipboard (Gabung dengan label yang ada)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Wyrównaj węzły</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Gabung label pada clipboard dengan sifat yang sedang dipilih.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Scal węzły w %1</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Crrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>GPS error</source>
-        <translation>Błąd GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Terpilih...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4153"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Nie można otworzyć portu GPS.</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Tempel Ciri-(ciri)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4162"/>
-        <source>Open NMEA log file</source>
-        <translation>Otwórz log NMEA</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Tempel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Tempel ciri dari clipboard</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>P&omoc</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Tempel ciri pada clipboard; Jika identitas ciri sudah ada pada dokumen, timpa saja.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Utwórz</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Ulice</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Edycja</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Biner)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Widok</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Paksa mengunggah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Zakładki</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Memasukkan ciri ke lapisan kotor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Ustaw &odwzorowanie</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Memasukkan ciri terpilih dari lapisan yang tak dapat terunggah (seperti Jalur atau Ekstrak) ke lapisan kotor, siap untuk unggah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Plik</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>&Narzędzia</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Styl</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Tombol Baris-Perangkat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Węzły</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Sembunyikan/Tampilkan baris-peralatan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Okna</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Sembunyikan semua</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Panele</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>&Cecha</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Tampilkan semua</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>Lapisan &Gambar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Warstwy</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>&Pokaż</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Tampilkan &titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Zamknij</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>Informacje &o</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Tampilkan &Nama</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Otwórz</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Utwórz nowy dokument i zaczerpnij plik</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Mulai</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Mulai GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Pokaż &wszystko</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Ulangi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Ulangi GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Powiększ &okno</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Powiększa okno</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Sembunyikan/Tampilkan wadah GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>&Zmniejsz</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>&Berhenti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Hentikan GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>&Powiększ</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Tengahkan ke GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Powiększ</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Tampilkan jalur &ruas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Zakrzywiony łącznik</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Tampilkan &skala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Cofnij</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Perlihatkan &relasi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Przywróć</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Tampilkan latar jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Tampilkan batas jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importuj</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Tampilkan perbaikan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importuje plik do obecnego dokumentu</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Rekam</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Rekam GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Łącznik</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Tunda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Utwórz łącznik</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Tunda GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoImage</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Sembunyikan/Tampilkan wadah GeoImage</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>&Usuń</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Manajer OSB Dunia...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>Penyusun &Shortcut...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Gabung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Simpan...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>Odw&róć</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Tambah anggota</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Dwujezdniową drogę</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Hapus anggota</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Nowy</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Tidak pernah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Tworzenie nowego dokumentu</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>untuk Jalan &Satu arah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Podziel</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Selalu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Lepaskan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>P&ołącz</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Lepaskan titik dari jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Lepaskan titik dari jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>Ro&zdziel</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Kerjakan Lokal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&lacja</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Gaya</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Obszar</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Sembunyikan/Tampilkan wadah Gaya</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Zapisz</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>&Rozciągnij</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>Penyusun Penyedia &WMS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation>Rozstaw węzły</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>Penyusun  Penyedia &TMS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Wyrówać i rozstawić wybrane węzły równomiernie</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Kembalikan status dialog dapat-dibuang</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Menu GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>Wyświetlanie wę&złów</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Kamera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Wyświetlanie &nazw</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Membuat &Persimpangan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>Edytor serwerów &WMS...</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Putar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>Edytor serwerów &TMS...</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
+        <location filename="../src/MainWindow.ui" line="1549"/>
         <source>&Polygon</source>
-        <translation>&Wielobok</translation>
+        <translation>&Poligon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
+        <location filename="../src/MainWindow.ui" line="1554"/>
         <source>Rectangular &building</source>
-        <translation>Prostokątny &budynek</translation>
+        <translation>&Bangunan Persegi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
+        <location filename="../src/MainWindow.ui" line="1559"/>
         <source>Add new &Image layer</source>
-        <translation>Dodać nową warstwę &obrazu</translation>
+        <translation>Tambah lapisan &Gambar baru</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Ciri</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
+        <location filename="../src/MainWindow.ui" line="1572"/>
         <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Dodaj &adres (schemat Karlsruhe)</translation>
+        <translation>Tambah &nomor jalan (skema Karlsruhe)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
+        <location filename="../src/MainWindow.ui" line="1581"/>
         <source>&Subdivide</source>
-        <translation>&Rozdzielić</translation>
+        <translation>&Membagi-lagi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
+        <location filename="../src/MainWindow.ui" line="1584"/>
         <source>Subdivide segment equally</source>
-        <translation>Podziel segment równomiernie</translation>
+        <translation>Bagi-lagi ruas secara seimbang</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
+        <location filename="../src/MainWindow.ui" line="1587"/>
         <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation>Podziel na kawałki wybrany odcinek drogi (drogę i dwa pobliskie węzły) na odcinki równej długości.)</translation>
+        <translation>Bagi ruas jalan terpilih (jalan dan dua titik berdekatan) menjadi ruas yang sama panjang.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Tampilkan titik &virtual</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1603"/>
         <source>Show lat/lon &grid</source>
-        <translation>Wyświ&etlanie siatki współrzędnych</translation>
+        <translation>Tampilkan &kotak lintang/bujur</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
+        <location filename="../src/MainWindow.ui" line="1611"/>
         <source>&Lock zoom to tiled background</source>
-        <translation>&Zablokuj powiększenie do wielkości kafelków</translation>
+        <translation>&Kunci perbesaran ke latar persegi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
+        <location filename="../src/MainWindow.ui" line="1616"/>
         <source>&Projections Editor...</source>
-        <translation>Edytor &odzworowań…</translation>
+        <translation>Penyusun &Proyeksi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
+        <location filename="../src/MainWindow.ui" line="1624"/>
         <source>Show &Photos on map</source>
-        <translation>Wyświetlanie &zdjęć na mapie</translation>
+        <translation>Tampilkan &Foto pada peta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
+        <location filename="../src/MainWindow.ui" line="1629"/>
         <source>OsmChange (OSC)</source>
-        <translation>ZmianaOSM (OSC)</translation>
+        <translation>OsmChange (OCS)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
+        <location filename="../src/MainWindow.ui" line="1634"/>
         <source>Force Delete</source>
-        <translation>Wymuś usunięcie</translation>
+        <translation>Paksa Hapus</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation>Tambah lapisan OpenStreet&Bugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
+        <location filename="../src/MainWindow.ui" line="1644"/>
         <source>Close</source>
-        <translation>Zamknij</translation>
+        <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
+        <location filename="../src/MainWindow.ui" line="1649"/>
         <source>S&implify</source>
-        <translation>Up&rość</translation>
+        <translation>&Sederhanakan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
+        <location filename="../src/MainWindow.ui" line="1652"/>
         <source>Simplify road(s)</source>
-        <translation>Upraszcza drogę</translation>
+        <translation>Sederhanakan jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
+        <location filename="../src/MainWindow.ui" line="1655"/>
         <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Upraszcze drogi poprzez usunięcie zbędnych węzłów</translation>
+        <translation>Sederhanakan jalan dengan menghapus beberapa titik yang tidak penting</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
+        <location filename="../src/MainWindow.ui" line="1660"/>
         <source>&Filters Editor...</source>
-        <translation>Edytor &filtrów</translation>
+        <translation>Penyusun &Saringan...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
+        <location filename="../src/MainWindow.ui" line="1668"/>
         <source>&None</source>
-        <translation>Ż&aden</translation>
+        <translation>&Tidak ada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
+        <location filename="../src/MainWindow.ui" line="1677"/>
         <source>&Join Areas</source>
-        <translation>&Połącz obszary</translation>
+        <translation>&Gabung Area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
+        <location filename="../src/MainWindow.ui" line="1680"/>
         <source>Join touching areas</source>
-        <translation>Połącz stykające się obszary</translation>
+        <translation>Gabung area yang bersebelahan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
+        <location filename="../src/MainWindow.ui" line="1683"/>
         <source>Join areas which are touching.</source>
-        <translation>Połącz stykające się obszary.</translation>
+        <translation>Gabung area yang bersebelahan.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
+        <location filename="../src/MainWindow.ui" line="1692"/>
         <source>&Split Area</source>
-        <translation>&Podziel obszar</translation>
+        <translation>&Pisah Area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
+        <location filename="../src/MainWindow.ui" line="1695"/>
         <source>Split area between two nodes</source>
-        <translation>Podziel obszar międzt dwoma węzłami</translation>
+        <translation>Pisah area antar dua titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
+        <location filename="../src/MainWindow.ui" line="1698"/>
         <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation>Podziel wybrany obszar między dwoma wybranymi węzłami na dwa oddzielne obszary.</translation>
+        <translation>Pisah area terpilih antara dua titik terpilih ke dalam dua area terpisah.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
+        <location filename="../src/MainWindow.ui" line="1707"/>
         <source>&Terrace</source>
-        <translation>&Drabina</translation>
+        <translation>&Petak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
+        <location filename="../src/MainWindow.ui" line="1710"/>
         <source>Terrace area into residences</source>
-        <translation>Podziel zakres na mieszkania</translation>
+        <translation>Petak area ke tempat tinggal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
+        <location filename="../src/MainWindow.ui" line="1713"/>
         <source>Split a selected area into terraced residences.</source>
-        <translation>Podziel wybrany obszar na drabinkę mieszkań.</translation>
+        <translation>Pisahkan area terpilih ke beberapa petak pemukiman.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
+        <location filename="../src/MainWindow.ui" line="1718"/>
         <source>Toolbar Editor...</source>
-        <translation>Edytor paska narzędzi...</translation>
+        <translation>Penyusun Baris-Alat...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
+        <location filename="../src/MainWindow.ui" line="1727"/>
         <source>A&xis Align</source>
-        <translation>Wyrówanie &osi</translation>
+        <translation>Meluruskan A&xis</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
+        <location filename="../src/MainWindow.ui" line="1730"/>
         <source>Align edges to regular axes</source>
-        <translation>Wyrównaj kąty do regularnych osi</translation>
+        <translation>Sejajarkan tepi ke sumbu biasa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
+        <location filename="../src/MainWindow.ui" line="1733"/>
         <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation>Wyrównaj kąty do pewne ilości równomiernie rozstawionych osi.</translation>
+        <translation>Sejajarkan tepi ke beberapa sumbu yang berdekatan.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
+        <location filename="../src/MainWindow.ui" line="1738"/>
         <source>&Print...</source>
-        <translation>&Drukuj...</translation>
+        <translation>&Cetak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
+        <location filename="../src/MainWindow.ui" line="1743"/>
         <source>Print preview...</source>
-        <translation>Podgląd druku...</translation>
+        <translation>Pratinjau Cetak...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Properti...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
+        <location filename="../src/MainWindow.ui" line="1756"/>
         <source>Highlight dirt&y features</source>
-        <translation>Podświetlaj rzecz&y ruszane</translation>
+        <translation>Perjelas ciri ko&tor</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation>Tambah lapisan &Gambar baru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
+        <location filename="../src/MainWindow.ui" line="1770"/>
         <source>Cu&t</source>
-        <translation>&Wytnij</translation>
+        <translation>&Potong</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
+        <location filename="../src/MainWindow.ui" line="1773"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation>Tambah lapisan &Penyaring baru</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1786"/>
         <source>E&xtrude</source>
-        <translation>Wyczerpnij</translation>
+        <translation>&Tolak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
+        <location filename="../src/MainWindow.ui" line="1789"/>
         <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tolak interaksi untuk jalan (gaya JOSM)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
+        <location filename="../src/MainWindow.ui" line="1792"/>
         <source>Alt+X</source>
         <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
+        <location filename="../src/MainWindow.ui" line="1797"/>
         <source>Select toggle</source>
-        <translation>Przełącz wybranie</translation>
+        <translation>Pilih tombol</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
+        <location filename="../src/MainWindow.ui" line="1802"/>
         <source>Include children in selection</source>
-        <translation>Włącz pochodne do wyboru</translation>
+        <translation>Masukan anak kedalam objek terpilih</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
+        <location filename="../src/MainWindow.ui" line="1814"/>
         <source>Scale</source>
         <translation>Skala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
+        <location filename="../src/MainWindow.ui" line="1819"/>
         <source>Save as Template Document...</source>
-        <translation>Zachowaj jako Szablon Dokumentu...</translation>
+        <translation>Simpan sebagai Model Dokumen...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Zakrzywiona droga</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation>Buat multi-poligon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation>Tambahkan ke Multi&poligon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation>GDAL SQLite/SpatiLite</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation>Pendeteksi Jalan Bing</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Konfiguracja...</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation>Bangun-kembali &Sejarah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Wszystko...</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation>Tampahkan lapisan Map&Dust</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Eksportuje wszystkie widoczne warstwy do pliku</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation>Wireframe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Wyszukaj...</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation>Ctrl+Alt+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Wyszukaj i zaznacz elementy</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation>Pilih pendahulu-(pendahulu)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Widok...</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Unduh turunan yang hilang</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Eksportuje aktualny widok do pliku</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation>&Jembatan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>Dod&aj...</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation><html><head/><body><p>Ubah jalan menjadi jembatan</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Usuń...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Bersihkan label '%1' pada %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Scal</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Bersihan %1 label pada %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Scala zaznaczone węzły (pozostanie ten zaznaczony jako pierwszy)</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation>Menetapkan "sumber" label pada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Menghapus anggota '%1' pada %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Zapisz j&ako...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Susun ulang anggota pada relasi %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Mengubah relasi %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Pobierz więcej</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Membuat interaksi titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Pobiera zawartość aktualnego widoku do poprzednio pobranej warstwy</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Membuat titik pada Jalan: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Membuat Interaksi Area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Wyświetla/ukrywa panel właściwości</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Membuat Area %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Area: Membuat Jalan %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Wyświetla/ukrywa panel warstw</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Membuat lubang.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Anda ingin membuat lubang (lain) di area ini?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Wyświetla/ukrywa panel informacji</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Area: Jalan Selesai %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Area: Tambah titik %1 ke Jalan %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>Wyrówn&aj</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Tutup Area %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Wyrównuje zaznaczone węzły. Pierwsze dwa wskazują linię wyrównania.</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation>Membuat Interaksi jalan ganda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Tambah titik ke Jalan ganda %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Wyświetla/ukrywa panel operacji</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Membuat Jalan ganda %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Buat POI %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Wyświetlanie &pobranych obszarów</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>KLIK-KIRI untuk memulai; TAHAN-KLIK untuk skala; SHIFT-TAHAN-KLIK untuk memutar; KLIK-KIRI untuk mengakhiri</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Membuat Interaksi Poligon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Kopiuje tagi wybranej cechy do schowka; jeśli cecha jest punktem trasy kopiuje również jej współrzędne.</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Membuat Poligon %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Membuat Interaksi bundaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Wkleja (nadpisując) etykiety w schowku do wybranego elementu.</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Membuat Bundaran %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Membuat Interaksi jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Scal etykiety w schowku z etykietami aktualnie wybranej cechy.</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Membuat Titik %1 pada Jalan %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Membuat Jalan: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Zaznaczone...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Membuat titik: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>wkleje cechy ze schowka. Jeśli cechy o takich samych identyfikatorach znajdują się już w dokumencie zostaną nadpisane.</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Menambah Titik %1 ke Jalan %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Tutup Jalan %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>KLIK-KIRI untuk memilih; KLIK-KANAN untuk memindah-objek; CTRL-KLIK-KIRI untuk mengubah pilihan; SHIFT-KLIK-KIRI untuk menambah pilihan; KLIK-TAHAN-KIRI untuk memilih area; CTRL-TAHAN-KANAN untuk perbesaran; KLIK-GANDA untuk membuat titik; KLIK-GANDA pada titik untuk mengawali jalan;</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binarny)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>KLIK untuk pilih/pindah;CTRL-KLIK untuk mengubah yang terpilih;SHIFT-KLIK untuk menambah yang terpilih;SHIFT-TAHAN untuk memilih area;CTRL-TAHAN untuk perbesaran;KLIK-GANDA untuk membuat titik;KLIK-GANDA pada titik untuk mengawali jalan;</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Przesyła wybraną cechę z warstwy, która nie może zostać wysłana do OSM do warstwy roboczej</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Ubah Interaksi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Hapus ciri %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>Hapus ciri</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Przełącz pasek zadań</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Hapus Turunan.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Wyświetla/ukrywa pasek zadań</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>Anda akan menghapus titik turunannya juga? Sebagai catatan bahwa titik OSM diluar area unduh akan tetap terjaga.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Ukryj wszystkie</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>Balikan %1 jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation>Membuang Jalan %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Pokaż wszystkie</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>KLIK-KIRI untuk memilih; TAHAN-KIRI untuk memindah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>Warstwa z &obrazami</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Interaksi memindahkan titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Pindah Titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Pindah Titik %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Uruchom</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Titik di posisi yang sama ditemukan.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Odtwórz...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Anda akan menyatukan semua titik pada tempat yang baru?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Wyświetla/ukrywa panel GPS</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Gabungkan Titik kedalam %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation>Dodać warstwę OpenStreet&Bugs</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation>DEKATI untuk memilih;TAHAN-KIRI untuk memutar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation>Dodać nową warstwę &rysunku</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Interaksi Perputaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation>Dodać nową warstwę &filtrów</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation>Ciri Memutar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation>Utwórz wielobok</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation>DEKATI untuk memilih;TAHAN-KIRI untuk skala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation>Dodaj do w&ieloboku</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation>Interaksi Skala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation>GDAL</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation>Ciri Skala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation>Wykrywać dróg Bing</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>KLIK-KIRI untuk sudut pertama -> TAHAN-KIRI untuk menentukan area -> KLIK-KIRI untuk perbesaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation>Odtwó&rz historię</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Interaksi Perbesaran</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation>Dodać warstwę Map&Dust</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>Bentuk Pertukaran GPS (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation>Siatka</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>Bentuk OpenStreetMap (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation>Ctrl+Alt+W</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>Format perubahan OpenStreetMap (*.osc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation>Wybierz nadrzędne</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Bentuk Noni GPSPlot (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Pobierz brakujących członków</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>Bentuk catatan GPS NMEA (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>Berkas KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>Za&trzymaj</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Bentul pemisah koma (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Wyśrodkuj na GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Gambar geotag (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Wyświetlanie &segmentów tras</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>Shapefile ESRI (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation>Bahasa Markup Geography (*.gml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Wyświetlanie &skali</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation>Bentuk Biner Protobuf (*.pbf)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Bentuk yang didukung</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Wyświetlanie &relacji</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Dokumen Merkaartor (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Semua Berkas (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Wyświetlanie tła dróg</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>Kotak %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Wyświetlanie granic dróg</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Tidak dapat membuat berkas Proyeksi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Pokazuj detale</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projections.xml" tdak dapat dibuka dimanapun. Batalkan.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Nagraj</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Rendah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Wstrzymaj</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Tinggi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Wyświetla/ukrywa panel obrazów</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Buram</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Ciri</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Zmodyfikuj relację %1</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4444"/>
-        <source>Unresolved conflicts</source>
-        <translation>Nierozwiązane konflikty</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4444"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Proszę najpierw rozwiązać wszystkie istniejące kolizje</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relasi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4468"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Zaleca się zapisanie zmian w dokumencie po ich wysłaniu.
-Czy zrobić to teraz?</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Memuat gambar</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Ustaw znaczniki na %1</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Tambahkan posisi titik ke gambar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Ważne ostrzeżenie o prawach autorskich</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Geotag gambar dengan titik ini</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Podjęto próbę importu pliku KML. Należy być świadomym tego, że:
-
-- nie wolno importować do OpenStreetMap plików KML utworzonych w Google Earth. Mogłoby się wydawać, iż węzły utworzone w Google Earth są wyłącznym tworem użytkownika, jednakże w rzeczywistością stanowią tzw. utwór zależny od Google Earth i jako taki nie można ich wykorzystać w OSM.
-
-- jeśli pobrano plik z Internetu, istnieje możliwość, że są objęte prawem autorskim. Proszę się w pełni upewnić, że użycie tych danych w projekcie OpenStreetMap jest dozwolone przez autora albo dane te w domenie publicznej.
-
-W razie wszelkich wątpliwości, proszę skontaktować się z listą dyskusyjną "legal" lub "talk".
-
-Na pewno można legalnie zaimportować ten plik do OSM?</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Nie można otworzyć pliku do zapisu</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>Berkas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 nie mógł zostać otwarty do zapisu.</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Ubah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Pobierz</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Pandangan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Wyślij</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Perlihatkan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Przejdź do...</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Arah Panah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Tworzy drogę z dwiema jezdniami</translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Tworzenie ronda</translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Lapisan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Tworzenie relacji</translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Membuat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Znajdź</translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Scala węzły</translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Peralatan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Wyślij cechę na warstwę roboczą</translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation>Jendela</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Uruchom GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Tolong</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Powtórz GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation>Ciri Potong</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Clipboard tidak benar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Zatrzymaj GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Clipboard tidak berisi data yang benar.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Nagrywanie sygnału z GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation>Impor berkas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Wstrzymaj GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Perubahan belum disimpan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Menedżer World  OSB...</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>Peta ini berisi perubahan yang belum disimpan yang akan hilang ketika memulai yang baru.
+Anda ingin membatalkan memulai peta baru atau melanjutkan dan menggagalkan perubahan yang sebelumnya?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>Edytor &skrótów klawiszowych...</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation>Gaya yang belum tersimpan berubah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4278"/>
-        <source>Save Tag Templates</source>
-        <translation>Zapisz szablon etykiet</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation>Anda telah merubah gaya saat ini.
+Anda tetap ingin menyimpan perubahan?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4278"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Szablony etykiet Merkaartora (*.mat)</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Titik tuju</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4297"/>
-        <location filename="../src/MainWindow.cpp" line="4311"/>
-        <source>Open Tag Templates</source>
-        <translation>Otwórz szablon etykiet</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Jalur %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Edycja...</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Peringatan hak cipta Big Fat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Zapisz...</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Anda mencoba mengimpor berkas KML. Untuk diketahui bahwa :
+
+- Anda tidak dapat ke OSM dari berkas KML yang dibuat dari Google Earth. JIka anda berfikir bahwa titik yang anda buat dari GE adalah milik anda, itu sebetulnya bukan!
+Titik itu adalah turunan dari GE, dan, untuk yang demikian, tidak dapat digunakan di OSM.
+
+- Jika anda mengunduhnya dari Internet, kemungkinan disana ada hak cipta.
+Silahkan pastikan bahwa penggunaan data tersebut pada OSM sudah mendapat ijin dari pembuatnya, atau data tersebut berada pada domain publik.
+
+Jika tidak yakin, silahkan baca petunjuknya pada "legal" atau "talk" milis openstreetmap.
+
+Anda yakin bahwa KML ini boleh di impor ke OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Otwórz...</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Tidak ada berkas yang benar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Scal...</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 tidak dapat dibuka.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Dodaj członka do relacji</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation>Permintaan Kontrol Asing masuk</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Usuń członka z relacji</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation>Ingin memuat objek '%1', tapi tidak tahu caranya. Maaf.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Wyświetlanie strz&ałek kierunkowych</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation>Permintaan kontrol asing masuk</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation>URL Aksi tidak diketahui: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&acje</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Membuka berkas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>Dod&aj członka</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Versi Qt tua terdeteksi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Usuń członka</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Pengaturan anda menggunakan Qt %1, yang berisi beragam kesalahan saat mengunggah data ke OpenStreetMap menyebabkan kode respon penyedia 401 muncul. Anda yakin untuk melanjutkan (tidak disarankan).
+Untuk informasi lebih lanjut silahkan kunjungi http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nigdy</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Mengunggah OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>dla &jednokierunkowych dróg</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Sepertinya anda belum menentukan username dan password OpenStreetMap. 
+Anda ingin melakukannya sekarang?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>Z&awsze</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Kesalahan mengunduh</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Niska</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Peta tidak dapat diunduh</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Wysoka</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Kesalahan mengunduh OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Nieprzeźroczysta</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>OpenStreetBugs tidak dapat diunduh</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Nieprzeźroczystośc obszarów</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation>Kesalahan mengunduh MapDust</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Eksportuj</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation>Bugs MapDust tidak dapat diunduh</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Os&tatnio otwierane</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Membuat Poligon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Ostatnio i&mportowane</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Tentukan jumlah sisi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Przesuń</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Penggabungan Jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Zaznacz</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Pemisahan Jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopiuj</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Pemutusan Jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Wklej etykiety (&nadpisanie)</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Sederhanakan Jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Wklej etykiety (&scal)</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Paksa mengunggah Ciri</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Odłącz węzeł %1</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Jaringan kehabisan waktu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>O&dłącz</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Tidak dapat menghubungi OpenStreetBugs.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Odłącz węzeł od drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Kesalahan menutup bug</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Znaleziono węzły o tych samych współrzędnych.</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Tidak dapat menghapus bug. Pesan penyedia adalah 
+%1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Czy na pewno scalić wszystkie węzły w miejscu docelowym?</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Membuat Persimpangan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>Pra&cuj w trybie offline</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Beberapa persimpangan.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Pobierz dane dla nowego obszary</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Jalan itu memiliki banyak persimpangan.
+Anda tetap akan membuat persimpangan untuk tiap jalan (Persimpangan yang salah tetap dapat dihapus setelahnya)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Wyślij zmiany na serwer</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Tambahkan Nomor Jalan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Usuń wybrane cechy</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>Jumlah ruas dibagi dalam</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Utwórz nową drogę</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation>Tentukan jumlah ruas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Utwórz nowy węzeł</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>Membagi lagi jalan ke %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Odwróć kierunek drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation>Sejajarkan sumbu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Podziel drogę w osobne, połączone ze sobą drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation>Tentukan jumlah sumbu normal untuk mensejajarkan tepian (contoh 4 untuk persegi)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Złącz połączone drogi w jedną</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>segitiga</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Rozłącz</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>segi-empat</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Rozłęcza połączone ze sobą drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>segi-lima</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Utwórz nowy obszar</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>segi-enam</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Zapisz do pliku</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>segi-tujuh</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Pobierz więcej danych dla obecnego obszaru</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>segi-delapan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Wyrównaj węzły</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>Sejajarkan ke %1 sumbu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Skopiuje zaznaczoną cechę i znaczniki do schowka</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>Sejajarkan ke %1 sumbu normal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Wkelj etykiety</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation>Tidak dapat mensejajarkan ke sumbu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Wkleja etykiety ze schowka (scala z obecnymi etykietami)</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>Pensejajaran ke sumbu gagal. Silahkan sesuaikan sudut lancip dan coba lagi.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Wklej</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>Pensejajaran ke sumbu gagal dan tidak menemukan solusinya.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Wkleja cechy ze schowka</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation>Ekstrak Bing</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Oddziel węzeł od drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Sejajarkan Titik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation>Sebarkan Titik</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Usuń członka %1 z %2</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Lepaskan Titik %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Właściwości</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Tambahkan anggota ke relasi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informacje</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Hapus anggota dari relasi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation>Tambahkan ke Multipoligon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eobraz</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Gabung area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Style</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Pisahkan area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Wyświetla/ukrywa panel styli</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation>Petak area ke %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3850"/>
-        <source>%1 (int)</source>
-        <translation>%1 (wb.)</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Membuat relasi %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Dodaj dziurę.</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Simpan gaya peta</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Utworzyć nową dziurę w tym obszarze?</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Gaya peta Merkaartor (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Nie można wczytać pliku z odzworowaniem</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Memuat gaya peta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>Plik "Projections.xml" nie mógł zostać otwarty. Przerywanie...</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Gaya peta Merkaartor (*.mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Otwórz pliki</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation>MapCSS stylesheet (*.css)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Tworzy skrzyżowanie</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation>Bangun-kembali Sejarah</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4011"/>
-        <location filename="../src/MainWindow.cpp" line="4020"/>
-        <source>Invalid projection</source>
-        <translation>Nieprawidłowe odwzorowanie</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation>Diusahakan untuk membangun kembali sejarah.
+Tidak bisa dipastikan juga, dan tidak ada pengembalian aksi.
+Anda yakin akan mencoba ini?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4011"/>
-        <location filename="../src/MainWindow.cpp" line="4020"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Nie można ustawić odzworowania "%1".</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>Tanpa Judul</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Simpan dokumen Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Zresetuj stan przełączalnych okien dialogowych</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Berkas dokumen Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Menu GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation>Simpan dokumen model Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Aparat cyfrowy</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Tidak dapat membuka berkas tersimpan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Utwórz &skrzyżowanie</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 tidak dapat dibuka untuk diubah.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
-        <source>Delete Children.</source>
-        <translation>Usuń potomków.</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation>Tidak dapat membuka dokumen model tersimpan</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Ustaw etykiety na wielu cechach</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Berkas tidak benar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Utwórz interakcję powierzchni</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 bukan dokumen Merkaartor yang benar.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Tworzenie węzła</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Ekspor OSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>Kliknij, aby rozpocząć; przeciągnij, aby przeskalować; przeciągnij z wciśniętym klawiszem SHIFT, aby obrócić; kliknij, aby zakończyć</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>Berkas OSM (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Tworzenie wielokątu</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Ekspor osmChange</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Utwórz wielokąt %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>Berkas osmChange (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Tworzenie ronda</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Ekspor GPX</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Tworzenie drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Berkas GPX (*.gpx)</translation>
     </message>
-    <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Działania</translation>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Ekspor KML</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Przesuń węzły</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Berkas KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Przesuń węzeł %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation>Pencabutan ciri</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>Kliknij aby zaznaczyć; przeciągnij, aby przesunąć</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation>Mencabut ciri...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Interakcja przesuwania węzła</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation>Sembunyikan label tombol alat</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation>ZAWIS zaznacza;LEWY-CIĄGNIE obraca</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Interakcja obrotu</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Tambahkan Penanda</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation>Obróć cechę</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Tentukan nama dari penanda.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>Kliknij, aby wyznaczyć pierwszy róg -> Przeciągnij, aby zaznaczyć obszar -> Kliknij, aby powiększyć</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Nama penanda tidak benar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Interakcja powiększenia</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Penanda tidak boleh kosong.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Utwórz wielokąt</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Peringatan: Nama Penanda sudah ada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Podaj ilość boków</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Isikan yang baru, biarkan sama untuk menimpa atau gagalkan.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Wymusza wysłanie cechy</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Menghapus Penanda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Wymyś wysłanie</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Pilih penanda yang akan dibuang.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Obróć</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Proyeksi tidak benar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Tidak dapat menetapkan proyeksi "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Rozbudowane skrzyżowanie.</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>Kesalahan GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Te drogi mają wiele przecięć.
-Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania można zawsze później usunąć ręcznie).</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Tidak dapat membuka pintu GPS.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Wklej cechę/cechy</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Membuka berkas catatan NMEA</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Cechy</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Simpan Model Label</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Wyświetlaj &wirtualne węzły</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Model label Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Wyczyść %1 etykiet na %2</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Buka Model Label</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Zmień kolejność członków relacji %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation>Perhatian! tidak dapat membuka terjemahan Merkaartor untuk bahasa "%1". Mengganti ke pengaturan awal Bahasa Inggris.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Konflik yang belum diperbaiki</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Silahkan perbaiki konflik yang ada terlebih dahulu</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Disarankan dengan sangat untuk menyimpan perubahan ke dokumen setelah mengunggah.
+Anda akan melakukannya sekarang?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Atur Label pada banyak ciri</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Tetapkan Label pada %1</translation>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
-        <translation><i>V: </i><b>%1</b&gt; </translation>
+        <translation><i>V: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>edytowane: </i><b>%1</b> przez <b>%2</b></translation>
+        <translation><i>terakhir: </i><b>%1</b> dari  <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
-        <translation><i>edytowane: </i><b>%1</b></translation>
+        <translation><i>terakhir: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation><br/><i>warstwa: </i><b>%1</b&gt; </translation>
+        <translation><br/><i>lapisan: </i><b>%1</b> </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation>Telusuri</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>size</source>
-        <translation>rozmiar</translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Titik tuju</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>members</source>
-        <translation>członkowie</translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>koord</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
-        <source>Topleft</source>
-        <translation>Górny lewy róg</translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>penjelasan</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
-        <source>Botright</source>
-        <translation>Dolny prawy róg</translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>komentar</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
-        <source>Relation</source>
-        <translation>Relacja</translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Titik</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
-        <source>Role</source>
-        <translation>Funckja</translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>ketinggian</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
-        <source>Member</source>
-        <translation>Członek</translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>kecepatan</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
-        <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>size</source>
+        <translation>ukuran</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
-        <source>Length</source>
-        <translation>Długość</translation>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>members</source>
+        <translation>anggota</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>Size</source>
-        <translation>Rozmiar</translation>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
+        <source>Topleft</source>
+        <translation>Kiri-atas</translation>
     </message>
     <message>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
         <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>%1 wezłów</translation>
+        <source>Botright</source>
+        <translation>Bawah-kanan</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Droga</translation>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
+        <source>Relation</source>
+        <translation>relasi</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Obszar</translation>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
+        <source>Role</source>
+        <translation>Aturan</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>współrzędne</translation>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
+        <source>Member</source>
+        <translation>Anggota</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>wzniesienie</translation>
+        <location filename="../src/Features/Way.cpp" line="903"/>
+        <source>Closed way</source>
+        <translation>Tutup jalan</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>prędkość</translation>
+        <location filename="../src/Features/Way.cpp" line="906"/>
+        <source>Length</source>
+        <translation>Panjang</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Punkt trasy</translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>Size</source>
+        <translation>Ukuran</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>opis</translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>%1 titik</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>komentarz</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Area</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Węzeł</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Jalan</translation>
     </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation>%1 m/plamkę</translation>
+        <translation>%1 m/pixel</translation>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation>Wyrównaj: %1m @ %2</translation>
+        <translation>Sejajar: %1m @ %2</translation>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
@@ -4788,52 +4798,72 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>%1ms</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation>Widok</translation>
+        <translation>Tampilan</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation>Ramka</translation>
+        <translation>Kotak Pembatas</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
-        <translation>Rzut</translation>
+        <translation>Proyeksi</translation>
     </message>
 </context>
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Nowy serwer</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Tanda Baru</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
-        <translation>Wysyłanie ustawień zakończone niepowodzeniem</translation>
+        <translation>Mengunggah Pilihan gagal</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
-        <translation>Duplikat klucza</translation>
+        <translation>Duplikasi kunci</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
-        <translation>Więcej niż 150 ustawień</translation>
+        <translation>Lebih dari 150 pilihan</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Nowa zakładka</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation>Komunikasi Pilihan gagal</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation>Kesalahan Komunikasi</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Penyedia Baru</translation>
     </message>
 </context>
 <context>
@@ -4841,12 +4871,12 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     <message>
         <location filename="../src/common/MultiProperties.ui" line="13"/>
         <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation>Bentuk</translation>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="33"/>
         <source>Tags</source>
-        <translation>Etykiety</translation>
+        <translation>Label</translation>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="53"/>
@@ -4856,25 +4886,25 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     <message>
         <location filename="../src/common/MultiProperties.ui" line="73"/>
         <source>Selected items</source>
-        <translation>Zaznaczone elementy</translation>
+        <translation>Objek terpilih</translation>
     </message>
 </context>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation>Rodzaj</translation>
+        <translation>Kelas</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
-        <translation>Nazwa</translation>
+        <translation>Nama</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
-        <translation>Nieznane pole</translation>
+        <translation>Bidang yang tidak diketahui</translation>
     </message>
 </context>
 <context>
@@ -4882,27 +4912,12 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     <message>
         <location filename="../src/NameFinder/namefinderwidget.cpp" line="91"/>
         <source>Error!</source>
-        <translation>Błąd!</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Nie znaleziono serwera serwisu wyszukiwania nazw.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Serwis wyszukiwania nazw odmówił połączenia.</translation>
+        <translation>Kesalahan!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
-        <translation>Serwis wyszukiwania nazw wymaga logowania.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Nieznany błąd.</translation>
+        <translation>Layanan pencari nama membutuhkan otentikasi.</translation>
     </message>
 </context>
 <context>
@@ -4910,7 +4925,7 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     <message>
         <location filename="../src/NameFinder/namefinderwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation>Bentuk</translation>
     </message>
 </context>
 <context>
@@ -4920,36 +4935,36 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>Output filename</source>
-        <translation>Plik wynikowy</translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation>Pliki PDF (*.pdf)</translation>
+        <translation>Nama berkas keluaran</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
-        <translation>bez nazwy</translation>
+        <translation>Tanpa Judul</translation>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation>Berkas PDF (*.pdf)</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
-        <translation>Wszystkie Pliki (*)</translation>
+        <translation>Semua Berkas (*)</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <source>Image files (*.png *.jpg)</source>
-        <translation>Pliki graficzne (*.png, *.jpg)</translation>
+        <translation>Berkas Gambar (*.png *.jpg)</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>SVG files (*.svg)</source>
-        <translation>Pliki SVG (*.svg)</translation>
+        <translation>Berkas SVG (*.svg)</translation>
     </message>
 </context>
 <context>
@@ -4957,62 +4972,62 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation>Eskport w formacie SVG/rastrowym</translation>
+        <translation>Ekspor Raster/SVG</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation>Ustawienia</translation>
+        <translation>Pilihan</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
         <source>min lat/Lon</source>
-        <translation>min szer./wys.</translation>
+        <translation>Lat/Lon terkecil</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="90"/>
         <source>max lat/Lon</source>
-        <translation>max szer./wys.</translation>
+        <translation>Lintang/Bujur terbesar</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation>Pokazuj węzły</translation>
+        <translation>Perlihatkan Titik</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation>Pokazuj relacje</translation>
+        <translation>Perlihatkan Relasi</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
         <source>Show Scale</source>
-        <translation>Wyświetlanie skali</translation>
+        <translation>Perlihatkan Skala</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation>Pokazuj siatkę pozycyjną</translation>
+        <translation>Perlihatkan Kotak Lintang/Bujur</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation>Pokazuj niestylizowane cechy</translation>
+        <translation>Tampilkan ciri tanpa gaya</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation>Eksportuj do PDF...</translation>
+        <translation>Ekspor ke PDF...</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation>Eksportuj do SVG...</translation>
+        <translation>Expor ke SVG</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation>Eksportuj do Raster...</translation>
+        <translation>Ekspor ke Raster...</translation>
     </message>
 </context>
 <context>
@@ -5020,12 +5035,12 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation>Bentuk</translation>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="25"/>
         <source>URL:</source>
-        <translation>Adres URL:</translation>
+        <translation>URL:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="35"/>
@@ -5036,54 +5051,31 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="74"/>
         <source>User:</source>
-        <translation>Użytkownik:</translation>
+        <translation>Pengguna:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation>Pwd</translation>
+        <translation>Password:</translation>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Zawsze</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Wybór koloru</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
-        <translation>Edytor stylu mapy</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
-        <source>Add</source>
-        <translation>Dodaj</translation>
+        <translation>Pengolah gaya peta</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
-        <source>Remove</source>
-        <translation>Usuń</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
+        <source>Global</source>
+        <translation>Global</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
-        <source>Duplicate</source>
-        <translation>Powiel</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
+        <source>Background</source>
+        <translation>Latar</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
@@ -5102,165 +5094,188 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation>Titik</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Ketebalan yang cukup</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>Perbaiki ketebalan</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
+        <source>Filter</source>
+        <translation>Seleksi</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
+        <source>Add</source>
+        <translation>Tambah</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
+        <source>Remove</source>
+        <translation>Hapus</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
+        <source>Duplicate</source>
+        <translation>Duplikasi</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
         <source>Tag selection</source>
-        <translation>Wybrana etykieta</translation>
+        <translation>Pemilihan label</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
         <source>meter/pixel</source>
-        <translation>metrów/piksel</translation>
+        <translation>meter/pixel</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
         <source>Visible up to</source>
-        <translation>Widoczne do</translation>
+        <translation>Terlihat sampai</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
         <source>Visible from scale</source>
-        <translation>Widoczne od skali</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
-        <source>Background</source>
-        <translation>Tło</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
-        <source>Filter</source>
-        <translation>Filtr</translation>
+        <translation>Terlihat dari skala</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="775"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1347"/>
         <source>Draw with color</source>
-        <translation>Rysuj na kolorowo</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Proporcjonalna grubość</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation>Węzły</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>Stała grubość</translation>
+        <translation>Gambarkan dengan warna</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
-        <translation>Kreskowanie</translation>
+        <translation>Berlari</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
         <source>off</source>
-        <translation>wyłączone</translation>
+        <translation>mati</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
         <source>Fill area</source>
-        <translation>Wypełnienie</translation>
+        <translation>Isikan area</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation>Wypełnij ikonką Touchup</translation>
+        <translation>Isi dengan ikon Touchup</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
         <source>Boundary</source>
-        <translation>Granica</translation>
+        <translation>Perbatasan</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation>Wnętrze</translation>
+        <translation>Interior</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation>Zewnętrzne</translation>
+        <translation>Eksterior</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
         <source>Touchup</source>
-        <translation>Szczegóły</translation>
+        <translation>Touchup</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="981"/>
         <source>Draw steps</source>
-        <translation>Rysuj schodki</translation>
+        <translation>Langkah menggambar</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
         <source>Draw icon</source>
-        <translation>Rysowanie ikony</translation>
+        <translation>Menggambar Ikon</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation>Rysuj oznaczenia kierunku ruchu</translation>
+        <translation>Gambar Tanda Arah Lalu Lintas</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
         <source>Label</source>
-        <translation>Etykieta</translation>
+        <translation>Label</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1370"/>
         <source>Font</source>
-        <translation>Czcionka</translation>
+        <translation>Huruf</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1417"/>
         <source>Label tag</source>
-        <translation>Treść etykiety</translation>
+        <translation>Tanda Label</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
+        <source>Halo</source>
+        <translation>Halo</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
+        <source>Area</source>
+        <translation>Area</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
-        <translation>Rysowanie z tłem</translation>
+        <translation>Gambar dengan warna latar</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
         <source>Label with background tag</source>
-        <translation>Etykieta z tłem</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
-        <source>Halo</source>
-        <translation>Halo</translation>
+        <translation>Beri Label dengan latar </translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
-        <source>Area</source>
-        <translation>Obszar</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Selalu</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
-        <source>Global</source>
-        <translation>Główne</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Pilih Warna</translation>
     </message>
 </context>
 <context>
@@ -5268,706 +5283,699 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
         <source>No Valid geotag</source>
-        <translation>Brak poprawnego geotagu</translation>
+        <translation>Tidak ada geotag yang benar</translation>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
         <source>TextLabel</source>
-        <translation>Etykieta tekstowa</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation>Ta fotografia nie zawiera danych kartograficznych EXIF.
-Co robić?</translation>
+        <translation>Foto ini tidak berisi data geotag EXIF.
+Apa yang ingin anda lakukan berikutnya?</translation>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
         <source>Try to match with a track node</source>
-        <translation>Spróbuj dopasować do węzła trasy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
         <source>Load without associated node</source>
-        <translation>Wczytaj bez przypisanego węzła</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
         <source>Extract info from barcode (Walking Papers)</source>
-        <translation>Pobierz informacje z kodu kreskowego (Walking Papers)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
         <source>Ignore it</source>
-        <translation>Ignoruj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
         <source>Do this for all current photos.</source>
-        <translation>Wykonaj dla wszystkich bierzących zdjęć.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
-        <translation>Plik wynikowy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>untitled</source>
-        <translation>bez nazwy</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
-        <translation>Wszystkie Pliki (*)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Image files (*.png *.jpg)</source>
-        <translation>Pliki graficzne (*.png, *.jpg)</translation>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Okno dialogowe</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>Pliki SVG (*.svg)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
+        <source>Visual</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Wybór koloru</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
+        <source>General</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Narzędzie już istnieje</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
+        <source>Zoom Out/in (%)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Narzędzie o tej nazwie już istnieje.
-Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfikować już istniejące.</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
+        <source>Opacity low/high</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Nie można usunąć tego narzędzia</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
+        <source>Single mouse button interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Nie można usunąc narzędzia "%1"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
+        <source>Use custom Qt style</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Nie można zmodyfikować nazwy narzędzia</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Nie można zmodyfikować nazwy narzędzia "%1"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Wybór pliku wykonywalnego</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
+        <source>Colors</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Wybór katalogu logów</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
+        <source>Background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
-        <source>Preferences</source>
-        <translation>Konfiguracja</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
+        <source>Overwrite style</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
+        <source>Pixels</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
         <source>Locale</source>
-        <translation>Język</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
         <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Konieczne jest ponowne uruchomienie programu aby zastosować zmiany</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
         <source>Use language</source>
-        <translation>Język</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
         <source>Translate standard tags</source>
-        <translation>Tłumaczenie standardowych etykiet</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
-        <source>Visual</source>
-        <translation>Wygląd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
+        <source>Rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
-        <source>General</source>
-        <translation>Ogólne</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
+        <source>Options</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
-        <source>Zoom Out/in (%)</source>
-        <translation>Powiększenie (%)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
+        <source>Use Anti-aliasing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
-        <source>Opacity low/high</source>
-        <translation>Nieprzeźroczystość (niska/wysoka)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
+        <source>Disable Anti-alisaing while panning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
-        <source>Colors</source>
-        <translation>Kolory</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
+        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
-        <source>Background</source>
-        <translation>Tło</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
+        <source>Use current style for wireframe rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Podświetlenie</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
+        <source>Editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Zaznaczenie</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
+        <source>Quick editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Relacje</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
+        <source>Wireframe editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
+        <source>Full render editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
         <source>Map style</source>
-        <translation>Styl mapy</translation>
+        <translation>Gaya peta</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
         <source>Built-in</source>
-        <translation>Wbudowany</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
         <source>Custom</source>
-        <translation>Użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Wyłączenie styli dla warstw ze ścieżkami</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
         <source>Data</source>
-        <translation>Dane</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Hasło:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
+        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
+        <source>XAPI</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
+        <source>Nominatim (Geo Search)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
         <source>Documents</source>
-        <translation>Dokumenty</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
         <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <translation>Muat-otomatis model dokumen</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
         <source>Autosave documents after upload</source>
-        <translation>Automatyczne zapisywanie dokumentów po wysłaniu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
         <source>Tracks</source>
-        <translation>Ścieżki</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
         <source>Automatically extract tracks on open</source>
-        <translation>Automatycznie pobieranie ścieżek przy otwarciu</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
-        <source>Save NMEA log</source>
-        <translation>Zapisywanie logu NMEA</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation>Ustawianie czasu systemowego według GPS</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Sieć</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Ustawienia serwera proxy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Używanie serwera proxy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Adres:</translation>
+        <translation>Pecahkan jalur secara otomatis pada saat membuka</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation>Port:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
+        <source>Track layers readonly by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
+        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
-        <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
-        <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
-        <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
-        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
-        <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
-        <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
-        <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
+        <source>Save NMEA log</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
-        <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
-        <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
-        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
-        <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
-        <source>URL:</source>
-        <translation>Adres URL:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
-        <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
         <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>Uruchom lokalny serwer zgodny z JOSM na porcie 8111</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
         <source>Background Image</source>
-        <translation>Obraz tła</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
         <source>Cache directory</source>
-        <translation>Katalog pamięci podręcznej</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
         <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Rozmiar pamięci podręcznej (w Mb; 0 by wyłączyć)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
         <source>Map Adapter</source>
-        <translation>Adapter map</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
         <source>Tools</source>
-        <translation>Narzędzia</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
         <source>Name:</source>
-        <translation>Nazwa:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
         <source>Path:</source>
-        <translation>Ścieżka:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
         <source>Apply</source>
-        <translation>Zastosuj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
         <source>Add</source>
-        <translation>Dodaj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
         <source>Remove</source>
-        <translation>Usuń</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
-        <source>Pixels</source>
-        <translation>pikseli</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Szablon etykiet</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Szablon etykiet Merkaartor (*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Szablon</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
-        <source>Single mouse button interaction</source>
-        <translation>Obsługa pojedynczym klawiszem myszy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Buforowanie kafli (nieaktywne dla Yahoo! z powodów prawnych)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
-        <source>Overwrite style</source>
-        <translation>Nadpisanie stylu</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Tryb oddzielnego przesuwania</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
-        <source>Use custom Qt style</source>
-        <translation>Użyj wbudowanego stylu Qt</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
-        <source>Track layers readonly by default</source>
-        <translation>Warstwy ścieżek domyślnie są tylko do odczytu</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
-        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation>Nie łącz ze sobą wezłów GPX oddalonych o więcej niż... (w km; 0 aby wyłączyć)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Katalog z własnymi stylami</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Aktualny styl</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
         <source>English</source>
-        <translation>Angielski</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
         <source>Arabic</source>
-        <translation>Arabski</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
         <source>Croatian</source>
-        <translation>Horwacki</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
         <source>Czech</source>
-        <translation>Czeski</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
-        <translation>Niemiecki</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
         <source>French</source>
-        <translation>Francuski</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
         <source>Hungarian</source>
-        <translation>Węgierski</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
         <source>Italian</source>
-        <translation>Włoski</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
         <source>Japanese</source>
-        <translation>Japoński</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
         <source>Polish</source>
-        <translation>Polski</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
         <source>Brazilian Portuguese</source>
-        <translation>Portugalski (brazylijski)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
         <source>Russian</source>
-        <translation>Rosyjski</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Nazwa użytkownika:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Podświetlenie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>Ścieżka GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Proste wyświetlanie ścieżek GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Spanyol</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>Wejście GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Port szeregowy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Model label Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Komputer</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Korzystanie z wirtualnych węzłów (wymagane ponowne uruchomienie)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Holenderski</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>portugalski</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Słowacki</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Hiszpański</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Szwedzki</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>ukraiński</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Zaznaczanie ukrytych relacji</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Interfejs</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5975,52 +5983,52 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="14"/>
         <source>Projections setup</source>
-        <translation>Ustawienia rzutów</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="20"/>
         <source>Projections</source>
-        <translation>Rzuty</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="47"/>
         <source>Projection list:</source>
-        <translation>Lista rzutów:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="76"/>
         <source>Name:</source>
-        <translation>Nazwa:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="93"/>
         <source>PROJ4 string</source>
-        <translation>Parametry PROJ4</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="127"/>
         <source>Apply</source>
-        <translation>Zastosuj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="134"/>
         <source>Add</source>
-        <translation>Dodaj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="141"/>
         <source>Remove</source>
-        <translation>Usuń</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation>Proszę podać rzut</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6028,7 +6036,7 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation>Dokument</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6036,45 +6044,45 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="20"/>
         <source>Dialog</source>
-        <translation>Okno dialogowe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation>Zadane</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation>Standard (EPSG:...)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation>Dopasowane PROJ4(+proj=...)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation>WKT</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation>Błąd w ciągu WKT</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation>Nie można wyeksportować w postaci PROJ4</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation>Blędny ciąg WKT</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6082,159 +6090,159 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/common/PropertiesDialog.ui" line="14"/>
         <source>Properties</source>
-        <translation>Właściwości</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PropertiesDock</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
-        <source>Properties</source>
-        <translation>Właściwości</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
-        <source>Error reading template file</source>
-        <translation>Błąd w trakcie wczytywania szablonu</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
-        <source>Center map</source>
-        <translation>Wyśrodkuj mapę</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
-        <source>Center && Zoom map</source>
-        <translation>Wyśrodkuj i powiększ mapę</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
         <source>%1/%1 selected item(s)</source>
-        <translation>%1/%1 zaznaczonych element/ów</translation>
+        <translation>%1/%1 objek terpilih</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="362"/>
         <source>%1/%2 selected item(s)</source>
-        <translation>%1/%2 zaznaczonych element/ów</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
         <source>Selected items</source>
-        <translation>Zaznaczone elementy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
         <source>Properties - Multiple elements</source>
-        <translation>Właściwości - wiele elementów</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
-        <source>Properties - Relation</source>
-        <translation>Właściwości - Relacja</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
-        <translation>Właściwości - Droga</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
-        <source>Select member</source>
-        <translation>Wybierz członka</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
+        <source>Properties - Relation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Właściwości - węzeł</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
+        <source>Properties</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation>Eksportuj GPX...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
+        <source>Error reading template file</source>
+        <translation>Kesalahan membaca berkas model</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
+        <source>Center map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation>Czerpanie...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
+        <source>Center && Zoom map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation>Zaczerpnięto: %1</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
+        <source>Select member</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QApplication</name>
     <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
-        <translation>Kaskodawe wyczyszczenie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="66"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="74"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="188"/>
         <source>Set Tag '%1=%2' on %3</source>
-        <translation>Ustaw znacznik %1=%2 na %3</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="314"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="400"/>
         <source>Clear Tag '%1' on %2</source>
-        <translation>Wyczyść znacznik %1 na %2</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/NodeCommands.cpp" line="17"/>
         <location filename="../src/Commands/NodeCommands.cpp" line="25"/>
         <location filename="../src/Commands/NodeCommands.cpp" line="111"/>
         <source>Move node %1</source>
-        <translation>Przesuń węzeł %1</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
-        <translation>Importuj plik osmChange</translation>
+        <translation>Impor osmChange</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportNGT.cpp" line="21"/>
         <source>Import NGT</source>
-        <translation>Importuj NGT</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
-        <translation>Importuj NMEA</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation>Wykrywanie dróg Bing</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation>Nie ma dostępu do wyjścia.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation>Brak poprawnych danych.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation>Nie można rozpoznać wyników.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6243,31 +6251,36 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <location filename="../src/GPS/qgps.cpp" line="91"/>
         <location filename="../src/GPS/qgps.cpp" line="150"/>
         <source>Invalid</source>
-        <translation>Niepoprawny</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="93"/>
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation>Nieulstalony</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation>Brak czasu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
         <source>Meters</source>
-        <translation>metrów</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="140"/>
         <source>km/h</source>
-        <translation>km/h</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/GPS/qgps.cpp" line="147"/>
+        <source>Unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="153"/>
@@ -6277,53 +6290,48 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/GPS/qgps.cpp" line="156"/>
         <source>3D</source>
-        <translation>3D</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation>Ustalony</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
         <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../src/GPS/qgps.cpp" line="147"/>
-        <source>Unavailable</source>
-        <translation>Niedostępne</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
-        <translation>Błąd logowania GPS</translation>
+        <translation>kesalahan catatan GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation>Nie można utworzyć logu GPS: %1.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation>Nie można połączyć z %1:%2</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
-        <translation>Błąd logowania GPS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation>Nie można utworzyć logu GPS: %1.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6331,69 +6339,69 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="14"/>
         <source>GPS</source>
-        <translation>GPS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="22"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="29"/>
         <source>TextLabel</source>
-        <translation>Etykieta tekstowa</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="63"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="80"/>
         <source>99 99' 99"</source>
-        <translation>99° 99' 99"</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="70"/>
         <source>Longitude</source>
-        <translation>Wysokość geograficzna</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="87"/>
         <source>Altitude</source>
-        <translation>Wysokość n.p.m.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="97"/>
         <source>1000 meter</source>
-        <translation>1000 metrów</translation>
+        <translation>1000 meter</translation>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="104"/>
         <source># Satellites</source>
-        <translation># satelit</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="114"/>
         <source>00</source>
-        <translation>00</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="121"/>
         <source>Fix Type</source>
-        <translation>Rodzaj ustalenia</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="131"/>
         <source>Invalid</source>
-        <translation>Niepoprawny</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="138"/>
         <source>Speed</source>
-        <translation>Prędkość</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="148"/>
         <source>000 km/h</source>
-        <translation>000 km/h</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="155"/>
         <source>Latitude</source>
-        <translation>Szerokość geograficzna</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6401,98 +6409,142 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/NameFinder/xmlstreamreader.cpp" line="45"/>
         <source>Not a proper results stream!</source>
-        <translation>Niepoprawny strumień!</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< S E P A R A T O R ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation>Dostosowanie paska narzędzi</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation>Operacje</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation>Paski narzędzi</translation>
+        <translation>Baris-peralatan</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation>Nowy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
-        <translation>Usuń</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation>Zmień nazwę</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation>Przywróć wszystko</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
-        <translation>Zastosuj</translation>
+        <translation>Terapkan</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation>Góra</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
-        <translation><-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
-        <translation>-></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation>W dół</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation>Bierzące działania paska narzędzi</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation>Dostosowany pasek narzędzi</translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation>QIODevice::Append tidak didukung untuk QuaZIODevice</translation>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6500,45 +6552,45 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
         <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="31"/>
         <source>Members</source>
-        <translation>Członkowie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation>Usuń wybranych członków/a</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
+        <source>...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
-        <translation>Etykiety</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation>Dodać etykiety "source"</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation>Usuń wybrane etykiety/a</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
-        <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6546,42 +6598,42 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="14"/>
         <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="34"/>
         <source>xxx</source>
-        <translation>xxx</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="41"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="61"/>
         <source>Tags</source>
-        <translation>Etykiety</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation>Dodać etykiety "source"</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation>Usuń wybrane etykiety/a</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6589,7 +6641,7 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/GPS/SatelliteStrengthView.cpp" line="50"/>
         <source>No satellites</source>
-        <translation>Brak satelit</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6597,42 +6649,42 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="14"/>
         <source>Selection</source>
-        <translation>Zaznaczenie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="25"/>
         <source>Key</source>
-        <translation>Klucz</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="32"/>
         <source>Value</source>
-        <translation>Wartość</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="45"/>
         <source>=</source>
-        <translation>=</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="55"/>
         <source>Name</source>
-        <translation>Nazwa</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
-        <translation>Zapytanie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation>Maksymalna ilość wyników (0 - nieograniczona)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Id</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6640,20 +6692,20 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="277"/>
         <source>Reset view</source>
-        <translation>Zresetuj widok</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation>Odświerz warstwę</translation>
+        <translation>Segarkan lapisan</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
-        <translation>Zamknij</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6661,7 +6713,7 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Docks/StyleDock.cpp" line="102"/>
         <source>Styles</source>
-        <translation>Style</translation>
+        <translation>Gaya</translation>
     </message>
 </context>
 <context>
@@ -6669,35 +6721,35 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Docks/StyleDock.ui" line="14"/>
         <source>Styles</source>
-        <translation>Style</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
-        <translation>Proszę dokładnie przejrzeć zmiany wysyłane do OSM</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="66"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="73"/>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Wyślij do Openstreetmap</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Proszę podać komentarz do tego zestawu zmian</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6705,134 +6757,123 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
         <source>TMS servers setup</source>
-        <translation>Ustawienia serwerów TMS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="20"/>
         <source>TMS Servers</source>
-        <translation>Serwery TMS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="47"/>
         <source>Server list:</source>
-        <translation>Serwery:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="78"/>
         <source>Name:</source>
-        <translation>Nazwa:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="99"/>
         <source>Server Url:</source>
-        <translation>Adres serwera:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="111"/>
         <source>Get Services</source>
-        <translation>Pobierz usługi</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="133"/>
         <source>Services :</source>
-        <translation>Usługi :</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="143"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">To jest serwer &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a></span></p></body></html></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
         <source>Projection:</source>
-        <translation>Rzut:</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation>Rozmiar kafla:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation>Minimalne powiększenie:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation>Maksymalne powiększenie:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation>zawartość etykiety "source":</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation>URL licencji:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Merkator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Szerokość/Wysokość (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>Początek w lewym dolnym rogu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
-        <translation>Zastosuj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="296"/>
         <source>Add</source>
-        <translation>Dodaj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="303"/>
         <source>Remove</source>
-        <translation>Usuń</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
-        <translation>Merkaartor: PobierzUsługi</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
-        <translation>Adres i ścieżka nie mogą być puste.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Nie można pobrać: %1.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
-        <translation>Błąd podczas wczytywania usług.
-</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6840,17 +6881,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TagModel.cpp" line="105"/>
         <source>Key</source>
-        <translation>Klucz</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="107"/>
         <source>Value</source>
-        <translation>Wartość</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.h" line="22"/>
         <source>Edit this to add...</source>
-        <translation>Kliknij aby dodać...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6858,7 +6899,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Okno formy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
@@ -6868,27 +6909,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
         <source>AND</source>
-        <translation>DODAJ</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation>NOT</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation>jest</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation>isoneof</translation>
+        <translation>salah-satu-dari</translation>
     </message>
 </context>
 <context>
@@ -6896,7 +6937,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/TagTemplate/TagTemplate.cpp" line="196"/>
         <source>Undefined</source>
-        <translation>Niezdefiniowany</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6904,7 +6945,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/TagTemplate/TagTemplate.cpp" line="913"/>
         <source>Undefined</source>
-        <translation>Niezdefiniowany</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6912,113 +6953,113 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation>Drabinka</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation>Brak numeracji domów</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation>Liczba domów</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation>Dodać numerację domów (schemat Karlsruhe)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation>Zakresy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
         <source>For example "1-9;15-17;19,19A"</source>
-        <translation>Przykładowo "1-9;15-17;19,19A"</translation>
+        <translation>Contoh "1-9; 15-17; 19, 19A"</translation>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation>Wzorek</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
         <source>All numbers</source>
-        <translation>Wszystkich członków</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation>Liczby nieprarzyste</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation>Liczby parzyste</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation>Dodatkowo możesz zaznaczyć węzeł w obszarze, jako początek dla numeracji domów.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
-        <translation>Ilość segmentów trasy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
-        <translation>%1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
-        <translation>Całkowita odległość</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
-        <translation>%1 km</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
-        <translation>Całkowity czas trwania</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
-        <translation>%1h %2m</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Wyodrębnij - %1</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
-        <translation>Wyodrębnij rysowaną warstwę</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
-        <translation>Powiększ</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
-        <translation>Zamknij</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7026,52 +7067,52 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="14"/>
         <source>Trackpoint</source>
-        <translation>Punkt trasy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="34"/>
         <source>Latitude</source>
-        <translation>Szerokość geograficzna</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="44"/>
         <source>Longitude</source>
-        <translation>Wysokość geograficzna</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="51"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="58"/>
         <source>xxx</source>
-        <translation>xxx</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="81"/>
         <source>Tags</source>
-        <translation>Etykiety</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation>Dodać etykiety "source"</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation>Usuń wybrane etykiety/a</translation>
+        <translation>Hapus label terpilih</translation>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7079,180 +7120,179 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="13"/>
         <source>Dialog</source>
-        <translation>Okno dialogowe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="36"/>
         <source>Website</source>
-        <translation>Adres</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="49"/>
         <source>Password</source>
-        <translation>Hasło</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="56"/>
         <source>Username</source>
-        <translation>Nazwa użytkownika</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="63"/>
         <source>Use proxy</source>
-        <translation>Użyj proxy</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="88"/>
         <source>Port</source>
-        <translation>Port</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="104"/>
         <source>99999; </source>
-        <translation>99999; </translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
-        <translation>Powiększ</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
-        <translation>Wyczyść</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: Pobierz właściwości</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adres i ścieżka nie mogą być puste.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Nie można pobrać: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation>Brak nazwy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Błąd podczas wczytywania właściwości.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
-        <translation>Ustawienia serwerów WMS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="20"/>
         <source>WMS Servers</source>
-        <translation>Serwery WMS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="47"/>
         <source>Server list:</source>
-        <translation>Serwery:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="78"/>
         <source>Name:</source>
-        <translation>Nazwa:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
-        <source>Layers:</source>
-        <translation>Warstwy:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>Rzut:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>Format obrazka:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
+        <source>Layers:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Style:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">To jest serwer pośredniczący WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;&quo [...]
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Ini ada tempat sementara WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"&g [...]
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation>Kafelkuj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
         <source>Zoom levels</source>
-        <translation>Stopnie powiększenia</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Gaya:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation>zawartość etykiety "source":</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation>URL licencji:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
         <source>Apply</source>
-        <translation>Zastosuj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="341"/>
         <source>Add</source>
-        <translation>Dodaj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="348"/>
         <source>Remove</source>
-        <translation>Usuń</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>Adres serwera:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Gagal unduh: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_it.ts b/translations/merkaartor_it.ts
index 93b3337..3d916c8 100644
--- a/translations/merkaartor_it.ts
+++ b/translations/merkaartor_it.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="it">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -9,47 +7,14 @@
         <translation>Informazioni su Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Questo programma è rilasciato sotto licenza GNU Public License v2</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
-        <source>TextLabel</source>
-        <translation>Etichetta di testo</translation>
-    </message>
-    <message>
         <location filename="../src/common/AboutDialog.ui" line="30"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Versione di Merkaartor</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -67,7 +32,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (creato con <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -80,7 +45,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Versione PROJ4</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -93,106 +58,164 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Versione GDAL</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Copyright Bart Vanhauwaert, Chris Browet e altri, 2006-2012</translation>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
+        <source>TextLabel</source>
+        <translation>Etichetta di testo</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Questo programma è rilasciato sotto licenza GNU General Public License v2</translation>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Log delle modifiche</translation>
     </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
 </context>
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Tasto rapido</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importa</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Esporta</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>Pre&definito</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Annulla</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Editor dei tasti rapidi</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Carica schema tasti rapisi</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Schema Tasti rapidi di Merkaartor (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Impossibile aprire il file</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>Impossibile aprire %1.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Salva schema Tasti rapidi</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>senza titolo</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Tutti i file (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Impossibile aprire il file</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 non può essere aperto in modifica.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -246,10 +269,7 @@ p, li { white-space: pre-wrap; }
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform>Ci sono <b>%n</b> oggetti scorretti</numerusform>
-            <numerusform>Ci sono <b>%n</b> oggetti scorretti</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -279,7 +299,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -296,7 +316,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
@@ -378,16 +398,6 @@ Server message is '%2'</source>
 Il server ha risposto con "%2"</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
-        <source>OPEN changeset</source>
-        <translation>APRI elenco cambimenti</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
-        <source>CLOSE changeset</source>
-        <translation>CHIUDI elenco cambiamenti</translation>
-    </message>
-    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
         <source>
 API message is '%1'</source>
@@ -399,6 +409,16 @@ Messaggio delle API '%1'</translation>
         <source>Uploading changes...</source>
         <translation>Caricamento modifiche</translation>
     </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
+        <source>OPEN changeset</source>
+        <translation>APRI elenco cambimenti</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
+        <source>CLOSE changeset</source>
+        <translation>CHIUDI elenco cambiamenti</translation>
+    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -501,97 +521,97 @@ Si prega di scaricare nuovamente la caratteristica con problemi per gestire il c
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>senza titolo</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Livello di lavoro</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Livello caricato (confermato)</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Immagine di sfondo</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation>Disegna livello #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation>Filtro strato #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>Esporta OSM</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Esportazione OSM in corso...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Documento</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -645,111 +665,73 @@ Si prega di scaricare nuovamente la caratteristica con problemi per gestire il c
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>errore</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>non ho scaricato a sufficienza</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Conflitti non risolti</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Prego correggere i conflitti esistenti prima di procedere</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Scaricamento punti</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 download</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>download da OSM (connessione)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Scaricomento non risolti...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Download fallito</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Download non risolti %1 di %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Utente/password non validi</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Analisi non risolti %1 di %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Download dei trackpoint %1 %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Analisi in corso...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
         <translation>Analisi XML</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
         <translation>Conflitti da %1</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Download %1,%2 (zoom %3)...</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Download traccia - nodi %1-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 download</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Rilevate strade/relazioni vuote</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Download non risolti %1 di %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Le strade/relazioni vuote sono probabilmente errori.
+Vuoi segnarle per la rimozione?</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Analisi non risolti %1 di %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Rimuovi caratteristica vuota %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
         <translation>Sono stati rilevati dei conflitti</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
@@ -758,132 +740,159 @@ Le modifiche sono state duplicate come "conflict_..." nel Livello &quo
 Prima di poter fare l'upload delle modifiche, devi unire manualmente le due versioni e rimuovere quelle dal livello "Conflitti...".</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Rilevate strade/relazioni vuote</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Caricamento...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Le strade/relazioni vuote sono probabilmente errori.
-Vuoi segnarle per la rimozione?</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Prepara le modifiche</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Rimuovi caratteristica vuota %1</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Attendendo una risposta dal server</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>errore</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Scaricamento da OSM in corso (%n bytes)</numerusform>
-            <numerusform>Scaricamento da OSM in corso (%n bytes)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Scaricamento da OSM in corso (%n kBytes)</numerusform>
-            <numerusform>Scaricamento da OSM in corso (%n kBytes)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Scaricamento</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>download da OSM (connessione)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation>Codice http inaspettato (%1)
 Messaggio del Server: '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 Messaggio delle API '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Scaricamento</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Download fallito</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Analisi in corso...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Utente/password non validi</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Scaricomento non risolti...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Conflitti non risolti</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Caricamento...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Prego correggere i conflitti esistenti prima di procedere</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Prepara le modifiche</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Download dei trackpoint %1 %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Attendendo una risposta dal server</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Download traccia - nodi %1-%2</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Scaricamento punti</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Download %1,%2 (zoom %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Chiudi</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation>Impossibile cancellare</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
         <translation>Impossibile cancellare la sezione perché è al di fuori dell'area scaricata.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
         <translation>Impossibile cancellare tutto</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
         <translation>La selezione completa non può essere cancellata perché parte di essa è al di fuori dell'area scaricata.
 Cancellare il possibile?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
         <translation>Inverti strada %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
         <translation>Inverti %1 strada</translation>
     </message>
@@ -939,6 +948,11 @@ Cancellare il possibile?</translation>
         <translation>Scarica figli mancanti</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Aggiungi alla selezione</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Elimina</translation>
@@ -963,11 +977,6 @@ Cancellare il possibile?</translation>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Aggiungi alla selezione</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -1018,7 +1027,7 @@ Cancellare il possibile?</translation>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
@@ -1074,270 +1083,244 @@ Cancellare il possibile?</translation>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
-        <source>Geo Images</source>
-        <translation>Immagini GEO</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Timeout di rete</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
-        <source>Load geotagged Images</source>
-        <translation>Carica immagini GEO</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Impossibile leggere i dettagli della foto dal server di Walking Papers.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
-        <source>Select the layer to which the images belong:</source>
-        <translation>Seleziona il Livello al quale appartengono le immagini:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Si prega di specificare un Walking Papers URL</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
-        <source>Loading Images ...</source>
-        <translation>Caricamento immagini ...</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
-        <source>Abort loading</source>
-        <translation>Annulla caricamento</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
-        <source>Wrong image?</source>
-        <translation>Immagine errata?</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
-        <source>Specify offset</source>
-        <translation>Specifica offset</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
-        <source>Position images more to the:</source>
-        <translation>Posiziona l'immagini più a:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
-        <source>end of the track</source>
-        <translation>fine della traccia</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
-        <source>beginning of the track</source>
-        <translation>inizio della traccia</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
-        <source>hh:mm:ss</source>
-        <translation>hh:mm:ss</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
-        <source>ss 'seconds'</source>
-        <translation>ss 'secondi'</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
-        <source>mm 'minutes and' ss 'seconds'</source>
-        <translation>mm 'minuti e' ss 'secondi'</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>Indirizzo URL:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
-        <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
-        <translation>hh 'ore,' mm 'minuti e' ss 'secondi'</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
+        <source>Geo Images</source>
+        <translation>Immagini GEO</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
-        <source>Image "%1" was taken %2 before the next trackpoint was recorded.
-Do you still want to use it?</source>
-        <translation>Immagine "%1" è stata presa %2 prima della registrazione prossimo punto.
-Vuoi continuare ad utilizzarla?</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Centra mappa</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
-        <source>Image "%1" was taken %2 after the last trackpoint was recorded.
-Do you still want to use it?</source>
-        <translation>Immagine "%1" è stata presa %2 dopo la registrazione dell'ultimo punto.
-Vuoi continuare ad usarla?</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Rimuovi Immagini</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Timeout di rete</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Impossibile leggere i dettagli della foto dal server di Walking Papers.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Si prega di specificare un Walking Papers URL</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
+        <source>Copy filename to clipboard</source>
+        <translation>Copia il nome del file negli Appunti</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>Indirizzo URL:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Seleziona immagine successiva</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Centra mappa</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>Pag. Giù</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Seleziona immagine precedente</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
-        <source>Copy filename to clipboard</source>
-        <translation>Copia il nome del file negli Appunti</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>Pag Su</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
         <source>Save geotagged image...</source>
         <translation>Salva immagine geottagata...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
         <source>Photo layer</source>
         <translation>Livello foto</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
+        <source>Load geotagged Images</source>
+        <translation>Carica immagini GEO</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
+        <source>Select the layer to which the images belong:</source>
+        <translation>Seleziona il Livello al quale appartengono le immagini:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
         <translation>Il livello è in sola lettura</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
         <translation>Il livello utilizzato non può essere scritto. Dovrebbe?
 Se no, non è possibile caricare le immagini che contiene.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
+        <source>Loading Images ...</source>
+        <translation>Caricamento immagini ...</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
+        <source>Abort loading</source>
+        <translation>Annulla caricamento</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation>Il file non esiste</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>Impossibile trovare l'immagine "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation>Errore nell'aprire "%2":
 %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>No TrackPoint</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Errore nel caricamento dati EXIF da "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Nessun TrackPoint trovato per l'immagine "%1"</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
+        <source>Specify offset</source>
+        <translation>Specifica offset</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation>Immagini JPEG (*.jpg)</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
+        <source>Position images more to the:</source>
+        <translation>Posiziona l'immagini più a:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Errore nel caricamento dati EXIF da "%1"</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
+        <source>end of the track</source>
+        <translation>fine della traccia</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation>Specifica il nome del file in uscita</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
+        <source>beginning of the track</source>
+        <translation>inizio della traccia</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <source>Error while opening "%1":
-%2</source>
-        <translation>Errore durante l'apertura di "%1":
-%2</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
+        <source>hh:mm:ss</source>
+        <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Seleziona immagine successiva</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>No TrackPoint</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>Pag. Giù</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Nessun TrackPoint trovato per l'immagine "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Seleziona immagine precedente</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
+        <source>ss 'seconds'</source>
+        <translation>ss 'secondi'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>Pag Su</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
+        <source>mm 'minutes and' ss 'seconds'</source>
+        <translation>mm 'minuti e' ss 'secondi'</translation>
     </message>
-</context>
-<context>
-    <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Indirizzo OSM non valido</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
+        <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
+        <translation>hh 'ore,' mm 'minuti e' ss 'secondi'</translation>
     </message>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>L'indirizzo specificato non è valido!</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
+        <source>Wrong image?</source>
+        <translation>Immagine errata?</translation>
     </message>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Formato Coordinate non valido!</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
+        <source>Image "%1" was taken %2 before the next trackpoint was recorded.
+Do you still want to use it?</source>
+        <translation>Immagine "%1" è stata presa %2 prima della registrazione prossimo punto.
+Vuoi continuare ad utilizzarla?</translation>
     </message>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Le coordinate devono essere: '<lon sinistra>, <lat inferiore>, <lon destra>, <lat superiore>'</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
+        <source>Image "%1" was taken %2 after the last trackpoint was recorded.
+Do you still want to use it?</source>
+        <translation>Immagine "%1" è stata presa %2 dopo la registrazione dell'ultimo punto.
+Vuoi continuare ad usarla?</translation>
     </message>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Le coordinate devono essere: '<lat centrale>, <lon centrale>, <aumento lat>, <aumento lon>'</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation>Specifica il nome del file in uscita</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation>Immagini JPEG (*.jpg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <source>Error while opening "%1":
+%2</source>
+        <translation>Errore durante l'apertura di "%1":
+%2</translation>
     </message>
+</context>
+<context>
+    <name>GotoDialog</name>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
@@ -1356,12 +1339,12 @@ Se no, non è possibile caricare le immagini che contiene.</translation>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1394,51 +1377,77 @@ Se no, non è possibile caricare le immagini che contiene.</translation>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Indirizzo OSM non valido</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>L'indirizzo specificato non è valido!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Formato Coordinate non valido!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Le coordinate devono essere: '<lon sinistra>, <lat inferiore>, <lon destra>, <lat superiore>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Le coordinate devono essere: '<lat centrale>, <lon centrale>, <aumento lat>, <aumento lon>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Adattatore Forma</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
         <translation>Imposta la proiezioni come livello</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>Adattatore WMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>Adattatore TMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>Plugins</translation>
     </message>
@@ -1446,73 +1455,73 @@ Se no, non è possibile caricare le immagini che contiene.</translation>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Mappa - nessuna</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Mappa - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Map - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Map - WMS-Tiled - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Mappa - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Mappa - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation>Termini di Licenza: %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation>I termini di licenza non sono stati accettati</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
         <translation>Non hai spuntato la casella di controllo per esprire il tuo accordo con i termini di licenza.
 In questo modo, non potrai utilizzare le mappe come livelli.
 È davvero quello che vuoi?</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Dimensione Tile</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation>Zoom Min/Max</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Proiezione</translation>
     </message>
@@ -1520,138 +1529,39 @@ In questo modo, non potrai utilizzare le mappe come livelli.
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Stringa</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Finestra di dialogo</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Intero</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
+        <source>Input</source>
+        <translation>Input</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Float</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Longitudine</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Latitudine</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Proiezione non valida</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Impossibile impostare la proiezione.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Nessuna coordinata</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Latitudine o Longitudine mancanti. Sarà impossibile importare il file
-Vuoi veramente uscire?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Carica CSV impostazioni di imporazione</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Impostazioni importazione Merkaartor  (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>File non valido</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>Impossibile aprire %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 non è un file CSV di impostazione</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>Salva i parametri importati (CSV)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>senza titolo</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Tutti i file (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>Impossibile aprire le impostazioni importate salvate</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 non può essere aperto in modifica.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Finestra di dialogo</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
-        <source>Input</source>
-        <translation>Input</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
@@ -1768,16 +1678,115 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Salva parametri...</translation>
     </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Stringa</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Intero</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Float</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Longitudine</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Latitudine</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Proiezione non valida</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Impossibile impostare la proiezione.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Nessuna coordinata</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Latitudine o Longitudine mancanti. Sarà impossibile importare il file
+Vuoi veramente uscire?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Carica CSV impostazioni di imporazione</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Impostazioni importazione Merkaartor  (*.mis)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>File non valido</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>Impossibile aprire %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 non è un file CSV di impostazione</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>Salva i parametri importati (CSV)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>senza titolo</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Tutti i file (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>Impossibile aprire le impostazioni importate salvate</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 non può essere aperto in modifica.</translation>
+    </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
         <translation>Impossibile impostare la proieazione; per piacere specificane una</translation>
     </message>
@@ -1793,21 +1802,18 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n caratteristica</numerusform>
-            <numerusform>%n caratteristiche</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Caratteristiche</translation>
     </message>
@@ -1815,21 +1821,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Livelli</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Tutti</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>Tracce</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
         <source>Show All</source>
@@ -1857,6 +1848,16 @@ p, li { white-space: pre-wrap; }
         <translation>Chiudi</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Livelli</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Tutti</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
         <translation>Mappa</translation>
@@ -1867,6 +1868,11 @@ p, li { white-space: pre-wrap; }
         <translation>Disegna</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>Tracce</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
         <translation>Resetta i Livelli ai valori predefiniti</translation>
@@ -1875,61 +1881,61 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
-        <source>Layer CLose: Dirty objects present</source>
-        <translation>Livello CHiuso: Presenti oggetti scorretti</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
-        <source>There are dirty features on this layer.
-Are you sure you want to close it? (no Undo possible)</source>
-        <translation>Ci sono caratteristiche scorrette in questo livello.
-Sei sicuro di volerlo chiudere? (niente Undo)</translation>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
-        <source>Layer CLose: Not empty</source>
-        <translation>Livello CHiuso: Non vuoto</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
+        <source>Visible</source>
+        <translation>Visibile</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
-        <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation>Sei sicuro di voler chiudere questo livello? (niente Undo)</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
+        <source>Readonly</source>
+        <translation>Sola lettura</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Basso</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Opaco</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Opacità</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
-        <source>Visible</source>
-        <translation>Visibile</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <source>Layer CLose: Dirty objects present</source>
+        <translation>Livello CHiuso: Presenti oggetti scorretti</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
-        <source>Readonly</source>
-        <translation>Sola lettura</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
+        <source>There are dirty features on this layer.
+Are you sure you want to close it? (no Undo possible)</source>
+        <translation>Ci sono caratteristiche scorrette in questo livello.
+Sei sicuro di volerlo chiudere? (niente Undo)</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Forma</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <source>Layer CLose: Not empty</source>
+        <translation>Livello CHiuso: Non vuoto</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
+        <source>Are you sure you want to close this layer? (no Undo possible)</source>
+        <translation>Sei sicuro di voler chiudere questo livello? (niente Undo)</translation>
     </message>
 </context>
 <context>
@@ -1961,18 +1967,16 @@ Sei sicuro di volerlo chiudere? (niente Undo)</translation>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Caricamento dei Plugin...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Avvio...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1994,7 +1998,7 @@ Avvio...</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
         <source>&Road</source>
         <translation>St&rada</translation>
     </message>
@@ -2019,18 +2023,48 @@ Avvio...</translation>
         <translation>Imposta &proiezione</translation>
     </message>
     <message>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Imposta &opacità Aree</translation>
+    </message>
+    <message>
         <location filename="../src/MainWindow.ui" line="127"/>
         <source>&File</source>
         <translation>&File</translation>
     </message>
     <message>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Esporta</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Aperti di Re&cente</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Impor&tati di Recente</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>&Strumenti</translation>
+    </message>
+    <message>
         <location filename="../src/MainWindow.ui" line="178"/>
         <source>&Style</source>
         <translation>&Stile</translation>
     </message>
     <message>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation>Ta&gga templates</translation>
+    </message>
+    <message>
         <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
         <source>&Node</source>
         <translation>&Nodo</translation>
     </message>
@@ -2041,1536 +2075,1958 @@ Avvio...</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
         <source>&Docks</source>
         <translation>&Elementi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Cara&tteristica</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Livelli</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&azione</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>M&ostra</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Mostra Freccie direzion&ali</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Barra degli strumenti principale</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="396"/>
         <source>&Quit</source>
         <translation>&Esci</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
+        <location filename="../src/MainWindow.ui" line="404"/>
         <source>&About</source>
         <translation>&Informazioni su</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
+        <location filename="../src/MainWindow.ui" line="416"/>
         <source>&Open</source>
         <translation>&Apri</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
+        <location filename="../src/MainWindow.ui" line="419"/>
         <source>Create a new document and import a file</source>
         <translation>Crea un nuovo documento e importa un file</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
+        <location filename="../src/MainWindow.ui" line="422"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
+        <location filename="../src/MainWindow.ui" line="431"/>
         <source>Zoom &all</source>
         <translation>Zoom &tutti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
+        <location filename="../src/MainWindow.ui" line="434"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
+        <location filename="../src/MainWindow.ui" line="439"/>
         <source>Zoom &window</source>
         <translation>Zoom &finestra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
         <source>Zoom window</source>
         <translation>Zoom finestra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
+        <location filename="../src/MainWindow.ui" line="448"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
+        <location filename="../src/MainWindow.ui" line="457"/>
         <source>Zoom &out</source>
         <translation>Zoom indietr&o</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
+        <location filename="../src/MainWindow.ui" line="460"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
+        <location filename="../src/MainWindow.ui" line="469"/>
         <source>Zoom &in</source>
         <translation>Zoom avant&i</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
         <source>Zoom in</source>
         <translation>Zoom avanti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
+        <location filename="../src/MainWindow.ui" line="478"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
         <source>Curved link</source>
         <translation>Link curvo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
         <source>&Undo</source>
         <translation>&Annulla</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
+        <location filename="../src/MainWindow.ui" line="504"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
+        <location filename="../src/MainWindow.ui" line="513"/>
         <source>&Redo</source>
         <translation>&Ripeti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
+        <location filename="../src/MainWindow.ui" line="516"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>Sp&osta</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="531"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
+        <location filename="../src/MainWindow.ui" line="540"/>
         <source>&Import</source>
         <translation>&Importa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
+        <location filename="../src/MainWindow.ui" line="543"/>
         <source>Import a file into the current document</source>
         <translation>Importa un file nel documento corrente</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Scarica</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Scarica dati mappa per una nuova area</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="558"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
+        <location filename="../src/MainWindow.ui" line="563"/>
         <source>Link</source>
         <translation>Link</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
         <source>Create link</source>
         <translation>Crea link</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
+        <location filename="../src/MainWindow.ui" line="572"/>
         <source>L</source>
         <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Seleziona</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="587"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Carica</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Carica le modifiche sul server</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="602"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
+        <location filename="../src/MainWindow.ui" line="614"/>
         <source>R&emove</source>
         <translation>&Elimina</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Rimuovi caratteristica selezionata</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="620"/>
         <source>Del</source>
         <translation>Canc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Crea nuova strada</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="638"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Crea nuovo nodo</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="656"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
+        <location filename="../src/MainWindow.ui" line="668"/>
         <source>&Reverse</source>
         <translation>Inve&rti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Inverti direzione strada</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Vai a...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="688"/>
         <source>&Double carriage way</source>
         <translation>&Doppia carreggiata</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Crea Strada a doppia carreggiata</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Crea Rotonda</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="711"/>
         <source>&New</source>
         <translation>&Nuovo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
+        <location filename="../src/MainWindow.ui" line="714"/>
         <source>Create a new document</source>
         <translation>Crea un nuovo documento</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
+        <location filename="../src/MainWindow.ui" line="723"/>
         <source>&Split</source>
         <translation>&Suddividi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Suddividi strada in strade (connesse) diverse</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="729"/>
         <source>Alt+S</source>
         <translation>Alr+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
+        <location filename="../src/MainWindow.ui" line="738"/>
         <source>&Join</source>
         <translation>&Unisci</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Unisci le strade connesse in una solo strada</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="744"/>
         <source>Alt+J</source>
         <translation>Alt+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
+        <location filename="../src/MainWindow.ui" line="753"/>
         <source>&Break apart</source>
         <translation>Rom&pi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Suddividi</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Suddividi le strade connesse</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="762"/>
         <source>Alt+B</source>
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
+        <location filename="../src/MainWindow.ui" line="767"/>
         <source>Re&lation</source>
         <translation>Re&lazione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Crea Relazione</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="782"/>
         <source>&Area</source>
         <translation>&Area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Salva</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Crea nuova area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>Strada cur&va</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Modifica...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation>Ta&gga templates</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>S&alva come...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Carica...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>Strada cur&va</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
+        <location filename="../src/MainWindow.ui" line="814"/>
         <source>&Preferences...</source>
         <translation>&Preferenze...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
         <source>&All...</source>
         <translation>&Tutti...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
         <source>Export all visible layers to a file</source>
         <translation>Esporta tutti i livelli visibili in un file</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
+        <location filename="../src/MainWindow.ui" line="842"/>
         <source>&Find...</source>
         <translation>&Trova...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Trova</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="848"/>
         <source>Find and select items</source>
         <translation>Trova e seleziona elementi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
         <source>&Viewport...</source>
         <translation>&Visualizzati...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
         <source>Export the features in the viewport to a file</source>
         <translation>Esporta le caratteristiche visualizzate in un file</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
+        <location filename="../src/MainWindow.ui" line="869"/>
         <source>&Add...</source>
         <translation>&Aggiungi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
+        <location filename="../src/MainWindow.ui" line="874"/>
         <source>&Remove...</source>
         <translation>&Rimuovi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
+        <location filename="../src/MainWindow.ui" line="879"/>
         <source>&Merge</source>
         <translation>&Unisci</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Fondi i Nodi</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="885"/>
         <source>Merge the selected nodes (first selected will remain)</source>
         <translation>Unisce i nodi selezionati (il primo selezionato rimane)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
+        <location filename="../src/MainWindow.ui" line="888"/>
         <source>Alt+M</source>
         <translation>Alt+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>S&alva come...</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Salva</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Salva su file</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
+        <location filename="../src/MainWindow.ui" line="908"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
+        <location filename="../src/MainWindow.ui" line="917"/>
         <source>Download more</source>
         <translation>Scarica di più</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Scarica dati aggiuntivi mappa per l'area corrente</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
         <source>Download the current view to the previous download layer</source>
         <translation>Scarica la vista corrente nel livello scaricato in precedenza</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
+        <location filename="../src/MainWindow.ui" line="929"/>
         <source>Ctrl+Shift+D</source>
         <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Proprietà</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
         <source>Hide/Show the Properties dock</source>
         <translation>Mostra/Nasconde l'elemento delle Proprietà</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
+        <location filename="../src/MainWindow.ui" line="951"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
         <source>Hide/Show the Layers dock</source>
         <translation>Mostra/Nasconde elemento dei Livelli</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
+        <location filename="../src/MainWindow.ui" line="968"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Informazioni</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
         <source>Hide/Show the Info dock</source>
         <translation>Mostra/Nasconde l'elemento Informazioni</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
+        <location filename="../src/MainWindow.ui" line="985"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
+        <location filename="../src/MainWindow.ui" line="994"/>
         <source>&Align</source>
         <translation>&Allinea</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Allinea i nodi</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1000"/>
         <source>Align selected nodes. First two selected give the line.</source>
         <translation>Allinea i nodi selezionati. I primi due selezionati sono il riferimento per la linea.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
+        <location filename="../src/MainWindow.ui" line="1003"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>Conflitti non risolti</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>&Diffondi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Prego correggere i conflitti esistenti prima di procedere</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation>Diffondi nodi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Cambiamenti non salvati</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Allinea e distribuisci i nodi selezionati in modo uniforme.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>La mappa corrente contiene modifiche non salvate che saranno perse nella creazione di un nuovo documento.
-Vuoi annullare la creazione di un nuovo documento o continuare e scartare le modifiche di quella vecchia?</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Mostra/Nascondi finestra Annulla</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl-T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Mostra aree sc&aricate</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>File non valido</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>Impossibile aprire %1.</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Copia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Copia le caratteristiche selezionate e tag negli appunti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Copia i tag delle caratteristiche selezionati negli appunti; se la caratteristica è un trackpoint, copia anche le coordinate.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Rilevata una vecchia versione delle QT</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Il tuo setup utilizza QT %1, il quale contiene vari errori conosciuti nell'upload dei dati su OpenStreetMap che portano a risposte 401 da parte del server. Sei sicuro che vuoi continuare (sconsigliato).
-Per maggiori  informazioni vedi http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Incolla Tags (S&ovrascrivi)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Upload su OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Incolla (e sovrascrivi) i tag negli appunti sulla caratteristica selezionata.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>A quanto pare non hai specificato il tuo
-utente e password OpenStreetMap.
-Vuoi farlo adesso?</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Errore nel download</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Incolla Tags (&Unisci)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Impossibile scaricare la mappa</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Incolla i tag</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Errore nello scaricamento da OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Incolla i tag dagli appunti (uniscili a quelli esistenti)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>OpenStreetBugs non può essere scaricato</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Unisce i tags dagli appunti con quelli della caratteristica selezionata.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Selezionati...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Semplifica Strade</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Incolla caratteristica</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Timeout di rete</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Incolla</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Impossibile contattare OpenStreetBugs.</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Incolla caratteristiche dagli appunti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Errore nella chiusura del bug</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Incolla le caratteristiche dagli appuntiò Se la caratteristiche sono già nel documento, svrascrivile.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Impossibile eliminare il bug. Messaggio dal server:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Aggiungi Numeri alle Strade</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>Numero di segmenti in cui suddividere</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binario)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation>Specifica il numero di segmenti</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Forza l'upload</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>Dividi strada in %1</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Aggiungi caratteristica nel livello di modifica</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation>Allinea assi</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Deposita le caratteristiche selezionate da un livello non uploadabile (i.e. Tracce o Estrazione) al livello di lavoro, pronto per l'upload</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation>Specifica il numero di assi regolari da allineare ai bordi (ad es. 4 per un rettangolo)</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>triangolare</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>rettangolare</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Alterna visibilità Barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>pentagonale</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Mostra/Nascondi la Barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>Esagonale</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Nascondi tutti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>eptagonale</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>ottagonale</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Mostra tutti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>Allinea su %1 assi</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>Livello &Immagine</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>Allinea %1 su assi regolari</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation>Impossibile allineare gli assi</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Mostra &nodi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>Operazione di allineamento assi fallita. Si prega di regolare eventuali spigoli e riprovare.</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>L'operazione di allineamento degli assi è fallita e non converge su una soluzione</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Mostra no&mi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation>Diffondi Nodi</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Avvia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Avvia GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>Accedi alle aree</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Ripeti...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Dividi area</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Ripeti GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation>Abitazioni a Schiera in %1</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Salva lo stile della mappa</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Mostra/Nascondi finestra GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Stile mappa Merkaator (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Carica stile mappa</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>Fe&rma</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Formati supportati</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Ferma GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Stile mappa Merkaartor (*.mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centra sul GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation>Foglio di stile MapCSS (*.css)</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Mostra &segmenti traccia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Salva documento</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>senza titolo</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Mostra &scala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Documento di Merkaartor (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Tutti i file (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Mostra &relazioni</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation>Salva documento di template Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Mostra sfondo delle strade</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation>Impossibile aprire il documento di template salvato</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Mostra confine strade</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Esporta OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Mostra ritocchi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>File OSM (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Registra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Esporta osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Registra GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>File osmChange (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pausa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Aggiungi Segnalibro</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Pausa GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Specifica il nome del segnalibro.</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>Immagine G&eoreferenziata</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Nome segnalibro non valido</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Mostra/Nascondi finestra GeoImmagine</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Il segnalibro non può essere vuoto.</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Attenzione: Il segnalibro esiste già</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Gestione Mondo OSB...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Inseriscine uno nuovo, mantieni lo stesso nome per sovrascriverlo o annulla l'operazione.</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>Editor dei Ta&sti rapidi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Rimuovi Segnalibro</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Unisci...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Seleziona il segnalibro da rimuovere.</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Salva...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation>Attenzione! Impossibile caricare la traduzione di Merkaartor per la lingua %1. Impostato come default in Inglese.</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Aggiungi membro</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Rimuovi Tag '%1' su %2</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Rimuovi membro</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Crea Area %1</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Mai</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Area: Crea Strada %1</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>per strade a Senso Unic&o</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Area: Completa Strada %1</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Sempre</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Area: Aggiungi nodo %1 a Strada %2</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>S&epara</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>Chiudi Area %1</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Stacca il nodo da una strada</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Separa un nodo dalla Strada</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Aggiungi nodi a stada doppia carreggiata %1</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>Lavora Fuori &Linea</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Crea strada a doppia carreggiata %1</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Crea nodo sulla strada: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Stili</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Crea POI %1</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Nascondi/Mostra strumento per lo Stile</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Crea rotonda %1</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Crea Nodo %1 nella Strada %2</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>&WMS Servers Editor...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Crea Strada: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>&TMS Servers Editor...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Chiudi Strada %1</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Remposta valori possibili di stato della finestra di dialogo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>CLICK con il tasto SINISTRO per selezionare;CLICK con il tasto DESTRO per la panoramica;CTRL+CLICK con il tasto SINISTRO per alternare le selezioni;SHIFT+CLICK con il tasto SINISTRO per aggiungere una selezione;TRASCINA con il tasto SINISTRO per selezionare un'area;CTRL+TRASCINA con il tasto DESTRO per effettuare lo zoom;DOPPIO CLICK per creare un nodo; DOPPIO CLICK su un nodo per iniziare una strada;</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Menù GPS</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>CLICCA per selezionare/muovere;CTRL+CLICK per cambiare selezione;SHIFT+CLICK per aggiungere alla selezione; SHIFT+TRASCINA per selezionare un'area;CTRL+TRASCINA per zoommare;DOPPIO CLICK per crere un nodo;DOPPIO CLICK su un nodo per iniziare una strada;</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Videocamera</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Rimuovi caratteristica %1</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Crea co&ngiunzione</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation>Rimuovi caratteristiche</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Ruota</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>Vuoi anche eliminare i nodi figli?
-Ricorda che i nodi OSM al di fuori dell'area scaricata saranno mantenuti.</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation>Inverti %1 strada</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Appuntti non validi</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Unisci Strade</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Dividi Strade</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Caratteristiche</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Rompi Strade</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Aggiungi &numeri alle strade (schema Karlsruhe)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Crea relazione %1</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Suddividi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>File non valido</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation>Suddividi i segmenti egualmente</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Allinea Nodi</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation>Suddividi il segmento di strada selezionato (la strada e i due nodi adiacenti) in segmenti di uguale lunghezza.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Fondi Nodi in %1</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Mostra nodi &virtuali</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Mostra/Nascondi finestra Annulla</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Mostra &griglia lat/lon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>B&locca lo zoom in base allo sfondo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Copia i tag delle caratteristiche selezionati negli appunti; se la caratteristica è un trackpoint, copia anche le coordinate.</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>Editor &Proiezione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>Mostra &Foto sulla mappa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Incolla (e sovrascrivi) i tag negli appunti sulla caratteristica selezionata.</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Forza l'eliminazione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Unisce i tags dagli appunti con quelli della caratteristica selezionata.</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Selezionati...</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>S&emplifica</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Incolla le caratteristiche dagli appuntiò Se la caratteristiche sono già nel documento, svrascrivile.</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Semplifica strada/e</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>Semplifica la stada rimuovendo nodi bambini non necessari</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Relazione Modificate %1</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>&Editor filtri...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Consigliamo caldamente di salvare i cambiamenti al documento dopo un upload.
-Vuoi farlo ora?</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>&Nulla</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation>&Unisci Aree</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binario)</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation>Unisci aree in contatto.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 non è un documento di Merkaartor valido.</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation>Unisci settori che sono in contatto.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Esporta GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>&Dividi Aree</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Files GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation>Dividi area compresa tra due nodi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Esporta KML</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation>Dividi l'area selezionata compresa tra due nodi  in due aree separate.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Files KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>Abitazioni a Schiera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl-T</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Deposita le caratteristiche selezionate da un livello non uploadabile (i.e. Tracce o Estrazione) al livello di lavoro, pronto per l'upload</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation>Dividi l'area selezionata in residenze a schiera.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation>Modifica Barra degli Strumenti...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation>Allinea A&ssi</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Imposta Tags su %1</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation>Allinea i bordi agli assi regolari</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Crea Nodo: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation>Allinea i bordi di un certo numero di assi regolarmente spaziati</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Aggiungi Nodo %1 alla Strada %2</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>&Stampa...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>tile %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation>Stampa l'anteprima...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
         <source>Properties...</source>
         <translation>Proprietà...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Waypoints</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation>Evidenzia le caratteristiche scorrett&e</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Traccia %1</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>Errore GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation>Tag&lia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Impossibile aprire la porta di comunicazione con il GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Apri file di log NMEA</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Livelli</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation>E&strudere</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Mostra aree sc&aricate</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation>Estrudi interazione strade (stile JOSM)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Alterna visibilità Barra degli strumenti</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Mostra/Nascondi la Barra degli strumenti</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation>Selezione cambiamento</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Nascondi tutti</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation>Includere i bambini nella selezione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>Scala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Mostra tutti</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation>Salva come Documento di Template...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>Livello &Immagine</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Avvia</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Ripeti...</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Mostra/Nascondi finestra GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>Fe&rma</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centra sul GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Mostra &segmenti traccia</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Scarica figli mancanti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Mostra &scala</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Rimuovi Tag '%1' su %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Mostra &relazioni</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Cancella %1 tag su %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation>Imposta "sorgente" dei tag su %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Mostra sfondo delle strade</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Rimuovi membro '%1' da %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Mostra confine strade</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Riordina i membri in relazione a %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Mostra ritocchi</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Relazione Modificate %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Registra</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Interazione Crea nodo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pausa</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Crea nodo sulla strada: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Mostra/Nascondi finestra GeoImmagine</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Interazione Crea Area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Crea Area %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Impossibile aprire il file</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Area: Crea Strada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 non può essere aperto in modifica.</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Aggiungi un buco.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Trovati nodi nella stessa posizione.</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Vuoi aggiungere un (nuovo) buco a questa area?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Vuoi unire tutti i nodi nella posizione selezionata?</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Area: Completa Strada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Basso</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Area: Aggiungi nodo %1 a Strada %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Alto</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Chiudi Area %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Opaco</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>File</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Aggiungi nodi a stada doppia carreggiata %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Modifica</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Crea strada a doppia carreggiata %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>Vedi</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Crea POI %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>Mostra</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>CLICK-SINISTRO per iniziare; DRAG per scalare; SHIFT-DRAG per ruotare; CLICK-SINISTRO per finire</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Freccie direzionali</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Interazione creazione Poligono</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Crea Poligono %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Livelli</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Interazione crea rotonda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Crea</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Crea rotonda %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Caratteristica</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Interazione crea strada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Nodo</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Crea Nodo %1 nella Strada %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Via</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Crea Strada: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relazione</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Crea Nodo: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Aggiungi Nodo %1 alla Strada %2</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Chiudi Strada %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>CLICK con il tasto SINISTRO per selezionare;CLICK con il tasto DESTRO per la panoramica;CTRL+CLICK con il tasto SINISTRO per alternare le selezioni;SHIFT+CLICK con il tasto SINISTRO per aggiungere una selezione;TRASCINA con il tasto SINISTRO per selezionare un'area;CTRL+TRASCINA con il tasto DESTRO per effettuare lo zoom;DOPPIO CLICK per creare un nodo; DOPPIO CLICK su un nodo per iniziare una strada;</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>CLICCA per selezionare/muovere;CTRL+CLICK per cambiare selezione;SHIFT+CLICK per aggiungere alla selezione; SHIFT+TRASCINA per selezionare un'area;CTRL+TRASCINA per zoommare;DOPPIO CLICK per crere un nodo;DOPPIO CLICK su un nodo per iniziare una strada;</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Modifica interazione</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Rimuovi caratteristica %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>Rimuovi caratteristiche</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Elimina figli</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>Vuoi anche eliminare i nodi figli?
+Ricorda che i nodi OSM al di fuori dell'area scaricata saranno mantenuti.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>Inverti %1 strada</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation>Estrudi Strada %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>CLICK-SINISTRO per selezionare; TRASCINA-SINISTRO per spostare</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Iterazione sposta nodo</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Sposta Nodi</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Sposta Nodo %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Trovati nodi nella stessa posizione.</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Vuoi unire tutti i nodi nella posizione selezionata?</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Fondi Nodi in %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation>CLICCA per selezionare;TRASCINA con il tasto SINISTRO per ruotare</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Iterazione ruotazione</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation>Ruota Caratteristica</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation>CLICCA per selezionare;TRASCINA con il tasto SINISTRO per scalare</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation>Scala Interazione</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation>Scala Caratteristica</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>CLICK-SINISTRO sul primo angolo -> TRASCINA-SINISTRO per specificare l'area -> CLICK-SINISTRO per zoomare</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Iterazione Zoom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
+        <location filename="../src/MainWindow.cpp" line="191"/>
         <source>GPS Exchange format (*.gpx)
 </source>
         <translation>Formato Interscambio GPS (*.gpx)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
+        <location filename="../src/MainWindow.cpp" line="192"/>
         <source>OpenStreetMap format (*.osm)
 </source>
         <translation>Formato OpenStreetMap (*.osm)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
+        <location filename="../src/MainWindow.cpp" line="193"/>
         <source>OpenStreetMap change format (*.osc)
 </source>
         <translation>Cambia formato OpenStreetMap (*.osc)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
+        <location filename="../src/MainWindow.cpp" line="194"/>
         <source>Noni GPSPlot format (*.ngt)
 </source>
         <translation>Formato Noni GPSPlot (*.ngt)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
+        <location filename="../src/MainWindow.cpp" line="195"/>
         <source>NMEA GPS log format (*.nmea *.nma)
 </source>
         <translation>Formato log GPS NMEA (*.nmea, *.nma)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
+        <location filename="../src/MainWindow.cpp" line="196"/>
         <source>KML file (*.kml)
 </source>
         <translation>File KML (*.kml)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
+        <location filename="../src/MainWindow.cpp" line="197"/>
         <source>Comma delimited format (*.csv)
 </source>
         <translation>Formato delimitato da virgole (*.csv)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
+        <location filename="../src/MainWindow.cpp" line="200"/>
         <source>Geotagged images (*.jpg)
 </source>
         <translation>Immagine Georeferenziata (*.jpg)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
+        <location filename="../src/MainWindow.cpp" line="202"/>
         <source>ESRI Shapefile (*.shp)
 </source>
         <translation>Shapefile ESRI (*.shp)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
+        <location filename="../src/MainWindow.cpp" line="202"/>
         <source>Geography Markup Language (*.gml)
 </source>
         <translation>Geography Markup Language (*.gml)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
+        <location filename="../src/MainWindow.cpp" line="204"/>
         <source>Protobuf Binary Format (*.pbf)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Formati supportati</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
+        <location filename="../src/MainWindow.cpp" line="208"/>
         <source>Merkaartor document (*.mdc)
 </source>
         <translation>Documento Merkaartor (*.mdc)
 </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Tutti i file (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>tile %v / %m</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Impossibile careicale il file delle Proiezioni</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>Impossibile aprire il file "Projections.xml". Annullo l'operazione.</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Basso</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Alto</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Opaco</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Caratteristica</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Nodo</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="614"/>
         <source>Road</source>
         <translation>Strada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relazione</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="738"/>
         <source>Load image</source>
         <translation>Carica immagine</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
+        <location filename="../src/MainWindow.cpp" line="740"/>
         <source>Add node position to image</source>
         <translation>Aggiungi posizione nodo all'immagine</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
+        <location filename="../src/MainWindow.cpp" line="742"/>
         <source>Geotag image with this position</source>
         <translation>Geo tagga l'immagine con questa posizione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
+        <location filename="../src/MainWindow.cpp" line="744"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>File</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Modifica</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Vedi</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Mostra</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Freccie direzionali</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Livelli</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Crea</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Via</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
         <source>Tools</source>
         <translation>Strumenti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
         <source>Windows</source>
         <translation>Finestre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
         <source>Cut Features</source>
         <translation>Tagliare Funzioni</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
+        <source>Clipboard invalid</source>
+        <translation>Appuntti non validi</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
         <source>Clipboard do not contain valid data.</source>
         <translation>Gli appunti non contengono dati validi.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
         <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Cambiamenti non salvati</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>La mappa corrente contiene modifiche non salvate che saranno perse nella creazione di un nuovo documento.
+Vuoi annullare la creazione di un nuovo documento o continuare e scartare le modifiche di quella vecchia?</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Waypoints</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Traccia %1</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
         <source>Big Fat Copyright Warning</source>
         <translation>Avviso Importante sul Copyright</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
         <source>You are trying to import a KML file. Please be aware that:
 
  - You cannot import to OSM a KML file created from Google Earth. While you might
@@ -3598,1196 +4054,755 @@ Se non ne sei sicuro, discutine sulle mailing list "leagal" o "ta
 Sei assolutamente sicuro che questo file KML può essere importato legalmente in OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Apri file</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>File non valido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Stacca Nodo %1</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>Impossibile aprire %1.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Aggiungi elemento alla relazione</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Rimuovi membro dalla relazione</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Apri file</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Rilevata una vecchia versione delle QT</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Salva Template dei Tag</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Il tuo setup utilizza QT %1, il quale contiene vari errori conosciuti nell'upload dei dati su OpenStreetMap che portano a risposte 401 da parte del server. Sei sicuro che vuoi continuare (sconsigliato).
+Per maggiori  informazioni vedi http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Template dei Tag di Merkaartor (*.mat)</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Upload su OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Apri Template dei Tag</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>A quanto pare non hai specificato il tuo
+utente e password OpenStreetMap.
+Vuoi farlo adesso?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Mostra Freccie direzion&ali</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Errore nel download</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Imposta &opacità Aree</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Impossibile scaricare la mappa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Esporta</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Errore nello scaricamento da OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Aperti di Re&cente</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>OpenStreetBugs non può essere scaricato</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Impor&tati di Recente</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>&Strumenti</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Cara&tteristica</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Crea Poligono</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Specifica il numero di lati</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Unisci Strade</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&azione</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Dividi Strade</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>M&ostra</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Rompi Strade</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>Barra degli strumenti principale</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Semplifica Strade</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>Sp&osta</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Forza l'upload della caratteristica</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Scarica</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Timeout di rete</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Scarica dati mappa per una nuova area</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Impossibile contattare OpenStreetBugs.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Seleziona</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Errore nella chiusura del bug</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Carica</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Impossibile eliminare il bug. Messaggio dal server:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Carica le modifiche sul server</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Crea congiunzione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Rimuovi caratteristica selezionata</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Inserimento multiplo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Crea nuova strada</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Queste strade hanno intersezioni multiple
+Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere eliminate successivamente)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Crea nuovo nodo</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Aggiungi Numeri alle Strade</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Inverti direzione strada</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>Numero di segmenti in cui suddividere</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Vai a...</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation>Specifica il numero di segmenti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Crea Strada a doppia carreggiata</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>Dividi strada in %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Crea Rotonda</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation>Allinea assi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Suddividi strada in strade (connesse) diverse</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation>Specifica il numero di assi regolari da allineare ai bordi (ad es. 4 per un rettangolo)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Unisci le strade connesse in una solo strada</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>triangolare</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Suddividi</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>rettangolare</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Suddividi le strade connesse</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>pentagonale</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Crea Relazione</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>Esagonale</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Crea nuova area</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>eptagonale</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Modifica...</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>ottagonale</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Salva...</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>Allinea su %1 assi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Carica...</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>Allinea %1 su assi regolari</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation>Impossibile allineare gli assi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Trova</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>Operazione di allineamento assi fallita. Si prega di regolare eventuali spigoli e riprovare.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Fondi i Nodi</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>L'operazione di allineamento degli assi è fallita e non converge su una soluzione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Salva su file</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Scarica dati aggiuntivi mappa per l'area corrente</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Allinea Nodi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Proprietà</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation>Diffondi Nodi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informazioni</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Stacca Nodo %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Allinea i nodi</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Aggiungi elemento alla relazione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>&Diffondi</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Rimuovi membro dalla relazione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation>Diffondi nodi</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Allinea e distribuisci i nodi selezionati in modo uniforme.</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Accedi alle aree</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Copia</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Dividi area</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Copia le caratteristiche selezionate e tag negli appunti</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation>Abitazioni a Schiera in %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Incolla Tags (S&ovrascrivi)</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Crea relazione %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Incolla Tags (&Unisci)</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Salva lo stile della mappa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Incolla i tag</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Stile mappa Merkaator (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Incolla i tag dagli appunti (uniscili a quelli esistenti)</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Carica stile mappa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Incolla</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Stile mappa Merkaartor (*.mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Incolla caratteristiche dagli appunti</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation>Foglio di stile MapCSS (*.css)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Aggiungi caratteristica nel livello di modifica</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>Mostra &nodi</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>senza titolo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Mostra no&mi</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Salva documento</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Avvia GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Documento di Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Ripeti GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation>Salva documento di template Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Impossibile aprire il file</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 non può essere aperto in modifica.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Ferma GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation>Impossibile aprire il documento di template salvato</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Registra GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>File non valido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Pausa GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 non è un documento di Merkaartor valido.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>Immagine G&eoreferenziata</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Esporta OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Gestione Mondo OSB...</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>File OSM (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>Editor dei Ta&sti rapidi...</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Esporta osmChange</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Unisci...</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>File osmChange (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Aggiungi membro</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Esporta GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Rimuovi membro</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Files GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Mai</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Esporta KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>per strade a Senso Unic&o</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Files KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Sempre</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>S&epara</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Stacca il nodo da una strada</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Separa un nodo dalla Strada</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>Lavora Fuori &Linea</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Aggiungi Segnalibro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Specifica il nome del segnalibro.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Stili</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Nome segnalibro non valido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Nascondi/Mostra strumento per lo Stile</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Il segnalibro non può essere vuoto.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>&WMS Servers Editor...</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Attenzione: Il segnalibro esiste già</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>&TMS Servers Editor...</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Inseriscine uno nuovo, mantieni lo stesso nome per sovrascriverlo o annulla l'operazione.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Rimuovi Segnalibro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Seleziona il segnalibro da rimuovere.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Proiezione non valida</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Aggiungi &numeri alle strade (schema Karlsruhe)</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Impossibile impostare la proiezione '%1'</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Suddividi</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>Errore GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation>Suddividi i segmenti egualmente</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Impossibile aprire la porta di comunicazione con il GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation>Suddividi il segmento di strada selezionato (la strada e i due nodi adiacenti) in segmenti di uguale lunghezza.</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Apri file di log NMEA</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>Mostra &griglia lat/lon</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Salva Template dei Tag</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>B&locca lo zoom in base allo sfondo</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Template dei Tag di Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>Editor &Proiezione</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Apri Template dei Tag</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>Mostra &Foto sulla mappa</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation>Attenzione! Impossibile caricare la traduzione di Merkaartor per la lingua %1. Impostato come default in Inglese.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Conflitti non risolti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Forza l'eliminazione</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Prego correggere i conflitti esistenti prima di procedere</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Consigliamo caldamente di salvare i cambiamenti al documento dopo un upload.
+Vuoi farlo ora?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Imposta Tag su più caratteristiche</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Imposta Tags su %1</translation>
     </message>
+</context>
+<context>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
+        <source><i>V: </i><b>%1</b> </source>
+        <translation><i>V: </i><b>%1</b> </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
+        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
+        <translation><i>ultimo: </i><b>%1</b> di <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>ultimo: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
+        <source><br/><i>layer: </i><b>%1</b> </source>
+        <translation><br/><i>livello: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Waypoint</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>coordinate</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>descrizione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>commento</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Scarica figli mancanti</translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Nodo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Chiudi</translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>altezza sul liv. del mare</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>S&emplifica</translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>velocità</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Semplifica strada/e</translation>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>size</source>
+        <translation>dimensione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Semplifica la stada rimuovendo nodi bambini non necessari</translation>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
+        <source>members</source>
+        <translation>membri</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>&Editor filtri...</translation>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
+        <source>Topleft</source>
+        <translation>Alto sinistra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>&Nulla</translation>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
+        <source>Botright</source>
+        <translation>Basso destra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation>&Unisci Aree</translation>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
+        <source>Relation</source>
+        <translation>Relazione</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation>Unisci aree in contatto.</translation>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
+        <source>Role</source>
+        <translation>Ruolo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation>Unisci settori che sono in contatto.</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>&Dividi Aree</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation>Dividi area compresa tra due nodi</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation>Dividi l'area selezionata compresa tra due nodi  in due aree separate.</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>Abitazioni a Schiera</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation>Dividi l'area selezionata in residenze a schiera.</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation>Modifica Barra degli Strumenti...</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation>Allinea A&ssi</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation>Allinea i bordi agli assi regolari</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation>Allinea i bordi di un certo numero di assi regolarmente spaziati</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>&Stampa...</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation>Stampa l'anteprima...</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation>Evidenzia le caratteristiche scorrett&e</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation>Tag&lia</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation>E&strudere</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation>Estrudi interazione strade (stile JOSM)</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation>Alt+X</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation>Selezione cambiamento</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation>Includere i bambini nella selezione</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>Scala</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation>Salva come Documento di Template...</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Rimuovi membro '%1' da %2</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Aggiungi un buco.</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Vuoi aggiungere un (nuovo) buco a questa area?</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Impossibile careicale il file delle Proiezioni</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>Impossibile aprire il file "Projections.xml". Annullo l'operazione.</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Crea congiunzione</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Proiezione non valida</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Impossibile impostare la proiezione '%1'</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Remposta valori possibili di stato della finestra di dialogo</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Menù GPS</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Videocamera</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Crea co&ngiunzione</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Elimina figli</translation>
-    </message>
-    <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Imposta Tag su più caratteristiche</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Interazione Crea Area</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Interazione Crea nodo</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>CLICK-SINISTRO per iniziare; DRAG per scalare; SHIFT-DRAG per ruotare; CLICK-SINISTRO per finire</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Interazione creazione Poligono</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Crea Poligono %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Interazione crea rotonda</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Interazione crea strada</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Modifica interazione</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Sposta Nodi</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Sposta Nodo %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>CLICK-SINISTRO per selezionare; TRASCINA-SINISTRO per spostare</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Iterazione sposta nodo</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation>CLICCA per selezionare;TRASCINA con il tasto SINISTRO per ruotare</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Iterazione ruotazione</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation>Ruota Caratteristica</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>CLICK-SINISTRO sul primo angolo -> TRASCINA-SINISTRO per specificare l'area -> CLICK-SINISTRO per zoomare</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Iterazione Zoom</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Crea Poligono</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Specifica il numero di lati</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Forza l'upload della caratteristica</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Forza l'upload</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Ruota</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Inserimento multiplo</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Queste strade hanno intersezioni multiple
-Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere eliminate successivamente)?</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Incolla caratteristica</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Caratteristiche</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Mostra nodi &virtuali</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Cancella %1 tag su %2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Riordina i membri in relazione a %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation>Estrudi Strada %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation>CLICCA per selezionare;TRASCINA con il tasto SINISTRO per scalare</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation>Scala Interazione</translation>
-    </message>
-    <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation>Scala Caratteristica</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation>Imposta "sorgente" dei tag su %1</translation>
-    </message>
-</context>
-<context>
-    <name>MapFeature</name>
-    <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
-        <source><i>V: </i><b>%1</b> </source>
-        <translation><i>V: </i><b>%1</b> </translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
-        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>ultimo: </i><b>%1</b> di <b>%2</b></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>ultimo: </i><b>%1</b></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
-        <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation><br/><i>livello: </i><b>%1</b&gt; </translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>size</source>
-        <translation>dimensione</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
-        <source>members</source>
-        <translation>membri</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
-        <source>Topleft</source>
-        <translation>Alto sinistra</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
-        <source>Botright</source>
-        <translation>Basso destra</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
-        <source>Relation</source>
-        <translation>Relazione</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
-        <source>Role</source>
-        <translation>Ruolo</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Membro</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
         <translation>Strada chiusa</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>%1 nodi</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Via</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Area</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>coordinate</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Nodo</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Lunghezza</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>altezza sul liv. del mare</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>velocità</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Waypoint</translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>%1 nodi</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>descrizione</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Area</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>commento</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Via</translation>
     </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation>Vedi</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
         <translation>Riquadro di selezione</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Proiezione</translation>
     </message>
@@ -4795,34 +4810,44 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Nuovo server</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Nuovo Segnalibro</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Caricamento Preferenze fallito</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Chiave duplicata</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Più di 150 preferenze</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Nuovo Segnalibro</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Nuovo server</translation>
     </message>
 </context>
 <context>
@@ -4851,17 +4876,17 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Classe</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Campo sconosciuto</translation>
     </message>
@@ -4874,25 +4899,10 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>Errore!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Servizio ricerca nome server non trovato.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Servizio ricerca nome il server ha rifiutato la connessione.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Servizio ricerca nome richiede l'autenticazione.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Errore sconosciuto.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4913,11 +4923,6 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation>File PDF (*.pdf)</translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4925,6 +4930,11 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation>File PDF (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -5041,35 +5051,15 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>Editor stile mappa</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
-        <source>Add</source>
-        <translation>Aggiungi</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
-        <source>Remove</source>
-        <translation>Elimina</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
-        <source>Tag selection</source>
-        <translation>Seleziona Tag</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
-        <source>meter/pixel</source>
-        <translation>metri/pixel</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
-        <source>Visible up to</source>
-        <translation>Visibile fino a</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
+        <source>Global</source>
+        <translation>Globale</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
-        <source>Visible from scale</source>
-        <translation>Visibile dalla scala</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
+        <source>Background</source>
+        <translation>Sfondo</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
@@ -5088,6 +5078,11 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
@@ -5108,45 +5103,19 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>Spessore fisso</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
-        <source>Dashed</source>
-        <translation>Tratteggiata</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
-        <source>off</source>
-        <translation>disabilitato</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
-        <source>Fill area</source>
-        <translation>Riempi area</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
-        <source>Draw icon</source>
-        <translation>Disegna icona</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Sempre</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
+        <source>Filter</source>
+        <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Selezione Colore</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
+        <source>Remove</source>
+        <translation>Elimina</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
@@ -5154,20 +5123,25 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>Duplica</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
-        <source>Background</source>
-        <translation>Sfondo</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
+        <source>Tag selection</source>
+        <translation>Seleziona Tag</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
+        <source>meter/pixel</source>
+        <translation>metri/pixel</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
+        <source>Visible up to</source>
+        <translation>Visibile fino a</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
+        <source>Visible from scale</source>
+        <translation>Visibile dalla scala</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5177,6 +5151,23 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>Disegna con il colore</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
+        <source>Dashed</source>
+        <translation>Tratteggiata</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
+        <source>off</source>
+        <translation>disabilitato</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
+        <source>Fill area</source>
+        <translation>Riempi area</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
         <translation>Riempi con l'icona di Ritocco</translation>
@@ -5189,12 +5180,12 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5207,9 +5198,14 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>Disegna passi</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
+        <source>Draw icon</source>
+        <translation>Disegna icona</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5227,6 +5223,16 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>Etichetta Tag</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
+        <source>Halo</source>
+        <translation>Alone</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
+        <source>Area</source>
+        <translation>Area</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
         <translation>Disegna con colore di sfondo</translation>
@@ -5237,19 +5243,23 @@ Vuoi creare una giunzione per ognuna di esse (quelle non volute possono essere e
         <translation>Etichetta con tag di sfondo</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
-        <source>Global</source>
-        <translation>Globale</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
-        <source>Halo</source>
-        <translation>Alone</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Sempre</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
-        <source>Area</source>
-        <translation>Area</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Selezione Colore</translation>
     </message>
 </context>
 <context>
@@ -5274,7 +5284,7 @@ Cosa vuoi fare dopo?</translation>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
         <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
@@ -5300,6 +5310,11 @@ Cosa vuoi fare dopo?</translation>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Finestra di dialogo</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5313,6 +5328,11 @@ Cosa vuoi fare dopo?</translation>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>File SVG (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
         <translation>Tutti i file (*)</translation>
@@ -5322,16 +5342,6 @@ Cosa vuoi fare dopo?</translation>
         <source>Image files (*.png *.jpg)</source>
         <translation>File Immagini (*.png, *.jpg)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Finestra di dialogo</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>File SVG (*.svg)</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -5361,213 +5371,232 @@ Cosa vuoi fare dopo?</translation>
         <translation>Opacità bassa/alta</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Stile mappa</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
+        <source>Single mouse button interaction</source>
+        <translation>Iterazione singolo pulsante del mouse</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Personalizzato</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
+        <source>Use custom Qt style</source>
+        <translation>Utilizza stile Qt personalizzato</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Password:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation>Consenti la creazione di nodi/strade in modalità Selezione</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Rete</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Modalità Spostamento separato</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Impostazioni proxy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Usa nodi Virtuali (richiesta una nuova sessione)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Utilizza Proxy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Relazioni selezionabili mentre sono nascoste</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Host:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
+        <source>Colors</source>
+        <translation>Colori</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation>Porta:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
+        <source>Background</source>
+        <translation>Sfondo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Immagine di sfondo</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
-        <translation>Cartella cache</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
+        <source>Overwrite style</source>
+        <translation>Sovrascrivi stile</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Dimensione chache (in MB: 0 per disabilitare)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>Traccia GPX</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
-        <translation>Adattatore Mappa</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
+        <source>Pixels</source>
+        <translation>Pixels</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Dati</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Usa l'aspetto GPX semplice</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Documenti</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>interfaccia</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
-        <source>Autosave documents after upload</source>
-        <translation>Auto salva documenti dopo l'upload</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Passaggio mouse</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Interno</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Relazioni</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Selezionato</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Evidenzia</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation>Scorretto</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Lingua</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Disabilita stili per livello Tracce</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Potrebbe essere necessario il riavvio del programma per rendere effettive queste modifiche</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
-        <source>Tracks</source>
-        <translation>Tracce</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Utilizza lingua</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
-        <source>Automatically extract tracks on open</source>
-        <translation>Estrai automaticamente tracce su apertura</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Traduci i tag standard</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Selezione Colore</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
+        <source>Rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Lo strumento esiste già</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
+        <source>Options</source>
+        <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Uno strumento con questo nome esiste già.
-Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modificare quello esistente</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
+        <source>Use Anti-aliasing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Non posso eliminare uno strumento preimpostato</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
+        <source>Disable Anti-alisaing while panning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Non posso eliminare lo strumento preimpostato "%1"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
+        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Non posso modificare il nome di uno strumento preimpostato</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
+        <source>Use current style for wireframe rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Non posso modificare il nome dello strumento preimpostato "%1"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
+        <source>Editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Seleziona eseguibile dello strumento</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
+        <source>Quick editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation>Seleziona un documento di template</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
+        <source>Wireframe editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation>Documento Merkaartor (*.mdc)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
+        <source>Full render editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Seleziona la cartella per i Log</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Stile mappa</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
-        <source>Colors</source>
-        <translation>Colori</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Cartella stili personalizzati</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
-        <source>Background</source>
-        <translation>Sfondo</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Stile corrente</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Passaggio mouse</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Disabilita stili per livello Tracce</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Selezionato</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Template</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Relazioni</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Template dei Tag</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation>Consenti la creazione di nodi/strade in modalità Selezione</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Interno</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Personalizzato</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation>Scorretto</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Dati</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
@@ -5591,221 +5620,195 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Nominatim (Ricerca Geografica)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
-        <source>Save NMEA log</source>
-        <translation>Salva log NMEA</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation>Imposta l'ora di sistema sul GPS</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>Abilita server compatibile JOSM sulla porta 8111</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
-        <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation>Aggiungi automaticamente dei tag "sorgenti" quando crei delle caratteristiche su una mappa di sfondo</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
-        <source>Tools</source>
-        <translation>Strumenti</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Documenti</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
-        <source>Name:</source>
-        <translation>Nome:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation>Carica automaticamente il documento di template</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
-        <source>Path:</source>
-        <translation>Percorso:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
+        <source>Autosave documents after upload</source>
+        <translation>Auto salva documenti dopo l'upload</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
-        <source>Apply</source>
-        <translation>Applica</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1014"/>
+        <source>Tracks</source>
+        <translation>Tracce</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
-        <source>Add</source>
-        <translation>Aggiungi</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
+        <source>Automatically extract tracks on open</source>
+        <translation>Estrai automaticamente tracce su apertura</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
-        <source>Remove</source>
-        <translation>Elimina</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
+        <source>Track layers readonly by default</source>
+        <translation>Livelli Tracce in sola lettura per default</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Lingua</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
+        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
+        <translation>Non connettere i nodi GPX separati da più di (in km: 0 per disabilitare)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Potrebbe essere necessario il riavvio del programma per rendere effettive queste modifiche</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Utilizza lingua</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Traduci i tag standard</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Cartella stili personalizzati</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>Input GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Template dei Tag</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Template dei Tag di Merkaartor (*.mat)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Seriale</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Modalità Spostamento separato</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
-        <source>Single mouse button interaction</source>
-        <translation>Iterazione singolo pulsante del mouse</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Host</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
-        <source>Use custom Qt style</source>
-        <translation>Utilizza stile Qt personalizzato</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
+        <source>Save NMEA log</source>
+        <translation>Salva log NMEA</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
-        <source>Overwrite style</source>
-        <translation>Sovrascrivi stile</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation>Imposta l'ora di sistema sul GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
-        <source>Pixels</source>
-        <translation>Pixels</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
-        <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation>Impostazioni proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
-        <source>Options</source>
-        <translation>Opzioni</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation>Utilizza Proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
-        <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
-        <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Utente:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
-        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation>Porta:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
-        <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Host:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
-        <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
-        <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation>Abilita server compatibile JOSM sulla porta 8111</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
-        <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation>Immagine di sfondo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
-        <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation>Cache delle Tile (non attiva per Yahoo! a causa di restrizioni legali)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Stile corrente</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation>Cartella cache</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Template</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation>Dimensione chache (in MB: 0 per disabilitare)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation>Carica automaticamente il documento di template</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation>Adattatore Mappa</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
-        <source>Track layers readonly by default</source>
-        <translation>Livelli Tracce in sola lettura per default</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
+        <source>Automatically add "source" tag when creating features over a background map</source>
+        <translation>Aggiungi automaticamente dei tag "sorgenti" quando crei delle caratteristiche su una mappa di sfondo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
-        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation>Non connettere i nodi GPX separati da più di (in km: 0 per disabilitare)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
+        <source>Tools</source>
+        <translation>Strumenti</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
+        <source>Name:</source>
+        <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
+        <source>Path:</source>
+        <translation>Percorso:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
+        <source>Apply</source>
+        <translation>Applica</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Cache delle Tile (non attiva per Yahoo! a causa di restrizioni legali)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
+        <source>Remove</source>
+        <translation>Elimina</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
@@ -5820,7 +5823,7 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
         <source>Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
@@ -5828,6 +5831,11 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Ceco</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Olandese</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
         <translation>Tedesco</translation>
@@ -5858,6 +5866,11 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Polacco</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Portoghese</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
         <source>Brazilian Portuguese</source>
         <translation>Portoghese Brasiliano</translation>
@@ -5868,95 +5881,86 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Russo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Utente:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Evidenzia</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>Traccia GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Slovacco</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Usa l'aspetto GPX semplice</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Spagnolo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>Input GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Svedese</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>Ucraino</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Seriale</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Template dei Tag di Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Porta</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Selezione Colore</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Host</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Lo strumento esiste già</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Usa nodi Virtuali (richiesta una nuova sessione)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Uno strumento con questo nome esiste già.
+Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modificare quello esistente</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Olandese</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Non posso eliminare uno strumento preimpostato</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Portoghese</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Non posso eliminare lo strumento preimpostato "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Slovacco</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Non posso modificare il nome di uno strumento preimpostato</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Spagnolo</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Non posso modificare il nome dello strumento preimpostato "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Svedese</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Seleziona eseguibile dello strumento</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>Ucraino</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation>Seleziona un documento di template</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Relazioni selezionabili mentre sono nascoste</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation>Documento Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>interfaccia</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Seleziona la cartella per i Log</translation>
     </message>
 </context>
 <context>
@@ -6009,7 +6013,7 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6045,25 +6049,25 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6075,28 +6079,7 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
     </message>
 </context>
 <context>
-    <name>PropertiesDock</name>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
-        <source>Properties</source>
-        <translation>Proprietà</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
-        <source>Error reading template file</source>
-        <translation>Errore nella lettura del template file</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
-        <source>Center map</source>
-        <translation>Centra mappa</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
-        <source>Center && Zoom map</source>
-        <translation>Centra && zoom della mappa</translation>
-    </message>
+    <name>PropertiesDock</name>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
         <source>%1/%1 selected item(s)</source>
@@ -6118,9 +6101,9 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Proprietà - Elementi multipli</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
-        <source>Properties - Relation</source>
-        <translation>Proprietà - Relazione</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Proprietà - Nodi</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
@@ -6128,41 +6111,39 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Proprietà - Strada</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
-        <source>Select member</source>
-        <translation>Seleziona membro</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
+        <source>Properties - Relation</source>
+        <translation>Proprietà - Relazione</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Proprietà - Nodi</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
+        <source>Properties</source>
+        <translation>Proprietà</translation>
     </message>
-</context>
-<context>
-    <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation>Esportazione GPX...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
+        <source>Error reading template file</source>
+        <translation>Errore nella lettura del template file</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Annulla</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
+        <source>Center map</source>
+        <translation>Centra mappa</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation>Importando...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
+        <source>Center && Zoom map</source>
+        <translation>Centra && zoom della mappa</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
+        <source>Select member</source>
+        <translation>Seleziona membro</translation>
     </message>
+</context>
+<context>
+    <name>QApplication</name>
     <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
@@ -6189,7 +6170,30 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Sposta nodo %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation>Esportazione GPX...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation>Importando...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Importa da osmChange</translation>
     </message>
@@ -6199,31 +6203,31 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Importa NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importa NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6239,14 +6243,14 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6259,6 +6263,11 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>km/h</translation>
     </message>
     <message>
+        <location filename="../src/GPS/qgps.cpp" line="147"/>
+        <source>Unavailable</source>
+        <translation>Non disponibile</translation>
+    </message>
+    <message>
         <location filename="../src/GPS/qgps.cpp" line="153"/>
         <source>2D</source>
         <translation>2D</translation>
@@ -6271,28 +6280,23 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
-    <message>
-        <location filename="../src/GPS/qgps.cpp" line="147"/>
-        <source>Unavailable</source>
-        <translation>Non disponibile</translation>
-    </message>
 </context>
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Errore registrazione GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Impossibile create un file di log GPS: %1</translation>
     </message>
@@ -6300,17 +6304,17 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>Impossibile connettersi a %1:%2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Errore registrazione GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Impossibile create un file di log GPS: %1</translation>
     </message>
@@ -6396,95 +6400,139 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< S E P A R A T O R E ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>Personalizza toolbar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation>Barre degli strumenti</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Rinonima</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation>Ripristina Tutto</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Applica</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>Sopra</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation>Giu</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
         <translation>Azioni correnti toolbar</translation>
     </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< S E P A R A T O R E ></translation>
+    </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation>Toolbar personalizzata</translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6502,6 +6550,14 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Rimuovi membro/i selezionato/i</translation>
     </message>
     <message>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
         <translation>Tag</translation>
@@ -6521,14 +6577,6 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <source>Remove selected tag(s)</source>
         <translation>Rimuovi tag selezionato/i</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
 </context>
 <context>
     <name>RoadProperties</name>
@@ -6609,6 +6657,11 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <translation>Nome</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
         <translation>Ricerca</translation>
@@ -6618,11 +6671,6 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <source>Maximum returned results (0 for all)</source>
         <translation>Massimi risultati restituiti (0 per tutti)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Id</translation>
-    </message>
 </context>
 <context>
     <name>SlippyMapWidget</name>
@@ -6635,12 +6683,12 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
@@ -6664,6 +6712,16 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>Carica su Openstreetmap</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation>Prego specificare un commento per queste modifiche</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>Controlla attentamente le modifiche inviate ad OSM</translation>
@@ -6678,16 +6736,6 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Carica su Openstreetmap</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Prego specificare un commento per queste modifiche</translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
@@ -6731,7 +6779,7 @@ Prego inserire un altro nome o clicca su pulsanre <Applica> se vuoi modifi
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6745,6 +6793,21 @@ p, li { white-space: pre-wrap; }
         <translation>Proiezione:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Lat/Lon (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>Origin è in basso a destra</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
         <translation>Dimensione dei riquadri:</translation>
@@ -6770,21 +6833,6 @@ p, li { white-space: pre-wrap; }
         <translation>URL della licenza:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Lat/Lon (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>Origin è in basso a destra</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
         <translation>Applica</translation>
@@ -6800,24 +6848,18 @@ p, li { white-space: pre-wrap; }
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: GetServices</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Indirizzo e path non possono essere vuoti.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Download fallito: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Errore nella lettura dei servizi.
@@ -6827,11 +6869,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagModel</name>
     <message>
-        <location filename="../src/common/TagModel.h" line="22"/>
-        <source>Edit this to add...</source>
-        <translation>Modifica questo per aggiungere...</translation>
-    </message>
-    <message>
         <location filename="../src/common/TagModel.cpp" line="105"/>
         <source>Key</source>
         <translation>Chiave</translation>
@@ -6841,6 +6878,11 @@ p, li { white-space: pre-wrap; }
         <source>Value</source>
         <translation>Valore</translation>
     </message>
+    <message>
+        <location filename="../src/common/TagModel.h" line="22"/>
+        <source>Edit this to add...</source>
+        <translation>Modifica questo per aggiungere...</translation>
+    </message>
 </context>
 <context>
     <name>TagSelectorWidget</name>
@@ -6877,7 +6919,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6957,55 +6999,55 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Estrai - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation>n. di segementi traccia</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Distanza totale</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Durata totale</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Estrai - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Estrai il livello di disegno</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
@@ -7104,12 +7146,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Pulisci</translation>
     </message>
@@ -7137,31 +7179,26 @@ p, li { white-space: pre-wrap; }
         <translation>Nome:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>URL del Server</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>Livelli:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>Proiezione:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>Formato dell'immagine:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Stili:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -7170,6 +7207,11 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>Proiezione:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
         <translation>Ridimensionalo</translation>
@@ -7180,6 +7222,16 @@ p, li { white-space: pre-wrap; }
         <translation>Livelli di zoom</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation>Formato dell'immagine:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Stili:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
         <translation>valutazione "fonte" del tag:</translation>
@@ -7205,43 +7257,33 @@ p, li { white-space: pre-wrap; }
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
         <source>Merkaartor: GetCapabilities</source>
         <translation>Merkaartor: GetCapabilities</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Indirizzo e path non possono essere vuoti.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Download fallito: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation>Senza nome</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
         <source>Error reading capabilities.
 </source>
         <translation>Errore durante la lettura delle capacità.
 </translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>URL del Server</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Download fallito: %1.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation>Senza nome</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_ja.ts b/translations/merkaartor_ja.ts
index ed4d7fa..9aa985c 100644
--- a/translations/merkaartor_ja.ts
+++ b/translations/merkaartor_ja.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="ja">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,13 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -39,7 +32,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -52,7 +45,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -65,26 +58,26 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
         <translation>テキストラベル</translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
         <translation>このプログラムは、GNU一般公衆使用許諾バージョン2のもとでライセンスされています。</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -93,12 +86,12 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>変更ログ</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -106,93 +99,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>記述</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>ショートカット</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>インポート(&I)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>エクスポート(&E)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>デフォルト(&D)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>キャンセル(&C)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>ショートカットの編集</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>ショートカット設定をロード</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Merkaartorショートカット設定 (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>ファイルを開けません。</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 を開けません。</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>ショートカット設定の保存</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>タイトルなし</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>全てのファイル(*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>保存ファイルを開くことができません。</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 を書き込み用に開けません。</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -246,9 +269,7 @@ p, li { white-space: pre-wrap; }
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform><b>%n</b>個の変更されたオブジェクトがあります</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -278,7 +299,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -295,7 +316,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>ズーム</translation>
     </message>
@@ -384,6 +405,11 @@ API message is '%1'</source>
 APIメッセージは'%1'です</translation>
     </message>
     <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="464"/>
+        <source>Uploading changes...</source>
+        <translation>変更点をアップロード中...</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="490"/>
         <source>OPEN changeset</source>
         <translation>変更セットのオープン</translation>
@@ -393,11 +419,6 @@ APIメッセージは'%1'です</translation>
         <source>CLOSE changeset</source>
         <translation>チェンジセットを閉じる</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="464"/>
-        <source>Uploading changes...</source>
-        <translation>変更点をアップロード中...</translation>
-    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -500,97 +521,97 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>タイトルなし</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>変更された</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>アップロードされたレイヤー</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>背景画像</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation>描画レイヤー#%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation>フィルタレイヤー#%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>OSMエクスポート</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>OSMをエクスポート中...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>文書</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -644,243 +665,234 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>ダウンロード失敗</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 ダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>エラー</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>未解決部をダウンロード中...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>十分にダウンロードできません</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>OSM (%n バイト)のダウンロード</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>OSMデータ (%n キロバイト)のダウンロード</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>未解決の %2分の%1  をダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>OSMデータのダウンロード(接続中)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>%2中%1の未解決をパース中</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation>予期していないhttp状態コード(%1)
-サーバメッセージは'%2'です。</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>パース中...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation>
-APIメッセージは'%1'です</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>XMLのパース</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>ユーザ名/パスワードが不正です。</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>%1からの矛盾</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>解決できない矛盾</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>空の道路や関連を見つけました。</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>既存の矛盾を先に解決してください。</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>空の道路や関連はおそらく誤りです。
+これらに削除マークをつけますか?</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>空のフィーチャを削除します。 %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>矛盾を検出しました。</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>ダウンロードするポイント</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation>これは、あなたが最後にダウンロードした以降に変更した地物がサーバー上の誰かによって変更されたことを意味します。
+これらの地物は「競合...」レイヤーの"conflict_..."として複製されています。
+変更をアップロードする前に、手動で二つのバージョンをマージして、「競合...」レイヤーから取り除く必要があります。</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>XMLのパース</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>アップロード中...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>トラックポイント %1-%2のダウンロード</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>変更の準備中</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>トラック-ノードのダウンロード %1-%2</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>サーバの応答待ち</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 ダウンロード</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>エラー</translation>
     </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>未解決の %2分の%1  をダウンロード</translation>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>%2中%1の未解決をパース中</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>ダウンロード中...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>%1からの矛盾</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>OSMデータのダウンロード(接続中)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>矛盾を検出しました。</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation>予期していないhttp状態コード(%1)
+サーバメッセージは'%2'です。</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation>これは、あなたが最後にダウンロードした以降に変更した地物がサーバー上の誰かによって変更されたことを意味します。
-これらの地物は「競合...」レイヤーの"conflict_..."として複製されています。
-変更をアップロードする前に、手動で二つのバージョンをマージして、「競合...」レイヤーから取り除く必要があります。</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation>
+APIメッセージは'%1'です</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>空の道路や関連を見つけました。</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>ダウンロード失敗</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>空の道路や関連はおそらく誤りです。
-これらに削除マークをつけますか?</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>ユーザ名/パスワードが不正です。</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>空のフィーチャを削除します。 %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>解決できない矛盾</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>%1,%2 (ズーム %3)のダウンロード...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>既存の矛盾を先に解決してください。</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>ダウンロード中...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>トラックポイント %1-%2のダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>パース中...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>トラック-ノードのダウンロード %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>未解決部をダウンロード中...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>アップロード中...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>ダウンロードするポイント</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>変更の準備中</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>サーバの応答待ち</translation>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>%1,%2 (ズーム %3)のダウンロード...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>閉じる</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>ズーム</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation>削除できません</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
         <translation>ダウンロード領域外なので選択されたものを削除できません。</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
         <translation>全てを削除できません</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
         <translation>選択されたものの一部がダウンロード領域の外側なので、完全に削除することはできません。
 削除できるものだけを削除しますか?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
         <translation>ウェイ%1を反転</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
         <translation>%1ウェイを反転</translation>
     </message>
@@ -936,6 +948,11 @@ Delete what can be?</source>
         <translation>不足している子要素をダウンロードする</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>選択に追加</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>削除</translation>
@@ -960,11 +977,6 @@ Delete what can be?</source>
         <source>All</source>
         <translation>全て</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>選択に追加</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -1015,7 +1027,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
@@ -1071,236 +1083,236 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>ネットワークタイムアウト</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Walking Papersサーバから写真の詳細を読み込めません。</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Walking PapersのURLを指定してください</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>ジオイメージ</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>中央に表示</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>画像の削除</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>ファイル名をクリップボードにコピーする</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
         <translation>次のイメージを選択</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
         <translation>PgDown</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
         <translation>前のイメージを選択</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
         <translation>PgUp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>ジオタグ付き画像を保存...</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>写真レイヤー</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>ジオタグされた画像のロード</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>イメージが関連づくレイヤーの選択</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
-        <source>Loading Images ...</source>
-        <translation>画像のロード...</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation>レイヤーは読み込み専用</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
-        <source>Abort loading</source>
-        <translation>読み込みの停止</translation>
-    </message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation>使っているレイヤーは書き込みできません。書き込み可能にしますか?
+そうでなければ、これに画像を読み込むことはできません。</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
+        <source>Loading Images ...</source>
+        <translation>画像のロード...</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
+        <source>Abort loading</source>
+        <translation>読み込みの停止</translation>
+    </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation>そのようなファイルはありません</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>画像"%1"が見つかりません。</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation>"%2"読み込み時エラー:
 %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
         <translation>"%1"からのEXIFデータ読み込み時エラー</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>ネットワークタイムアウト</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Walking Papersサーバから写真の詳細を読み込めません。</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Walking PapersのURLを指定してください</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>中央に表示</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>ジオタグ付き画像を保存...</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>写真レイヤー</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation>レイヤーは読み込み専用</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation>使っているレイヤーは書き込みできません。書き込み可能にしますか?
-そうでなければ、これに画像を読み込むことはできません。</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation>オフセットの指定</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>トラックの終了点</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>トラックの開始点</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints</source>
         <translation>トラックポイントがない</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints found for image "%1"</source>
         <translation>画像"%1"にあうトラックポイントがありません。</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss '秒'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm '分' ss '秒'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh '時' mm '分' ss '秒'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>画像間違えた?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>イメージ "%1"は最初のトラックポイントが記録される前%2に取られました。
 それでもこれを使いますか?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>イメージ "%1"は最後のトラックポイントが記録された後%2に取られました。
 それでもこれを使いますか?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation>JPEG画像(*.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>Specify output filename</source>
         <translation>出力ファイル名を指定</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation>JPEG画像(*.jpg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>"%1"読み込み時エラー:
@@ -1310,32 +1322,6 @@ Do you still want to use it?</source>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>不正なOSMのURL</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>指定されたURLは不正です。</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>不正なCoordinatesフォーマット</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>座標は次のものでなければなりません: '<左経度>, <下緯度>, <右経度>, <上緯度>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>座標は次のものでなければなりません: '<中心緯度>, <中心経度>, <緯度幅>, <経度幅>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>移動</translation>
@@ -1353,12 +1339,12 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1391,51 +1377,77 @@ Do you still want to use it?</source>
         <source>Search</source>
         <translation>検索</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>不正なOSMのURL</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>指定されたURLは不正です。</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>不正なCoordinatesフォーマット</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>座標は次のものでなければなりません: '<左経度>, <下緯度>, <右経度>, <上緯度>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>座標は次のものでなければなりません: '<中心緯度>, <中心経度>, <緯度幅>, <経度幅>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>なし</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>形状アダプタ</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>ズーム</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
         <translation>ビューの投影法をレイヤーに設定</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>WMSアダプター</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>TMSアダプター</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>プラグイン</translation>
     </message>
@@ -1443,73 +1455,73 @@ Do you still want to use it?</source>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>マップ - なし</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>マップ - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>地図 - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>地図 - WMS-Tiled - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>マップ - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>マップ - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation>ライセンス条項: %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation>ライセンス条項を承諾していない</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
         <translation>あなたは、ライセンス規約に了承の意思表示のチェックボックスに入力をしていません。
 そのため、このソースをまっプレイヤーとして利用できません。
 本当にやりたいことですか?</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation>サーバ</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>タイルのサイズ</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation>最小/最大ズーム</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>投影法</translation>
     </message>
@@ -1517,105 +1529,6 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>文字列</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>整数</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>実数</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>経度</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>緯度</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>不正な投影法</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>投影法を設定できません。</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>座標なし</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>緯度又は経度のフィールドがありません。このファイルをインポートすることはできません。
-本当に終了しますか?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>CSV インポート設定を読み込む</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Merkaartorインポート設定 (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>不正なファイル</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 を開けません。</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1はCSVインポート設定ファイルではありません</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>CSVインポート設定を保存</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>タイトルなし</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>全てのファイル(*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>インポートする設定を保存するためにオープンできません</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 を書き込み用に開けません。</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>ダイアログ</translation>
@@ -1630,7 +1543,7 @@ Do you really want to exit?</source>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1693,7 +1606,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1765,46 +1678,143 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>設定を保存...</translation>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>文字列</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
-        <translation>投影法を設定できません; 一つ選択してください</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>整数</translation>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
-        <translation>情報</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>実数</translation>
     </message>
-</context>
-<context>
-    <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n要素</numerusform>
-        </translation>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>経度</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
-        <translation>サイズ</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>緯度</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>不正な投影法</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>投影法を設定できません。</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>座標なし</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>緯度又は経度のフィールドがありません。このファイルをインポートすることはできません。
+本当に終了しますか?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>CSV インポート設定を読み込む</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Merkaartorインポート設定 (*.mis)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>不正なファイル</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 を開けません。</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1はCSVインポート設定ファイルではありません</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>CSVインポート設定を保存</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>タイトルなし</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>全てのファイル(*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>インポートする設定を保存するためにオープンできません</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 を書き込み用に開けません。</translation>
+    </message>
+</context>
+<context>
+    <name>ImportExportGdal</name>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation>投影法を設定できません; 一つ選択してください</translation>
+    </message>
+</context>
+<context>
+    <name>InfoDock</name>
+    <message>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation>情報</translation>
+    </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation>サイズ</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
         <translation>地物</translation>
     </message>
 </context>
@@ -1823,6 +1833,21 @@ p, li { white-space: pre-wrap; }
         <translation>全て隠す</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
+        <source>Readonly All</source>
+        <translation>全て読み込み専用</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
+        <source>Readonly None</source>
+        <translation>全て読み込み専用解除</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="395"/>
         <source>Layers</source>
         <translation>レイヤー</translation>
@@ -1843,90 +1868,75 @@ p, li { white-space: pre-wrap; }
         <translation>描画</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation>レイヤーをデフォルトにリセットする</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
         <source>Tracks</source>
         <translation>トラック</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
-        <source>Readonly All</source>
-        <translation>全て読み込み専用</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
-        <source>Readonly None</source>
-        <translation>全て読み込み専用解除</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
-        <source>Close</source>
-        <translation>閉じる</translation>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation>レイヤーをデフォルトにリセットする</translation>
     </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation>可視</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation>読み込み専用</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>薄い</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>濃い</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>不透明</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>表示濃度</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
         <translation>レイヤークローズ: 変更オブジェクトが存在</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
         <translation>このレイヤーには変更された地物があります。
 本当に閉じますか?(元には戻せません)</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
         <translation>レイヤークローズ: 空でない</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
         <translation>本当にこのレイヤーを閉じてもいいですか?(元には戻せません)</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>フォーム</translation>
-    </message>
 </context>
 <context>
     <name>LicenseDisplayDialog</name>
@@ -1957,2796 +1967,2820 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-プラグイン読み込み中...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-初期化中...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>%2のタグ'%1'をクリアー</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>エリア %1 を作成する</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>ヘルプ(&H)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>領域: 道路作成 %1</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>作成(&C)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>穴の追加</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>道路(&R)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>この領域に穴を追加しますか?</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>編集(&E)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>領域: 道路終了 %1</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>ビュー(&V)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>エリア: ノード %1 を道路 %2 に追加</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>ブックマーク(&B)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>領域%1を閉じる</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>投影法の設定(&p)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>領域の表示濃度設定(&o)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>2車線道路%1にノードを追加</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>ファイル(&F)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>2車線道路%1を作成する</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>エクスポート(&E)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>道路にノードを作成する: %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>最近開いたファイル(&c)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>POI %1 を作成</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>最近のインポート(&t)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>ロータリー%1の作成</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>ツール(&T)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>道路 %2 にノード %1 を作成</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>スタイル(&S)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>道路%1の作成</translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation>タグテンプレート(&g)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>ノード作成:%1</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>ノード(&N)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>ノード %1 を 道路 %2 に追加</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>ウィンドウ(&W)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>道路%1を閉じる</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>ドック (&D)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>同じ位置のノードが見つかりました。</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>フィーチャ(&t)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>ドロップした位置の全てのノードをマージしますか?</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>ノードを%1にマージします</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>レイヤー(&L)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>左クリックで選択; 右クリックでスクロール; CTRL-左クリックで選択のオン/オフ; SHIFT-左クリックで選択へ追加; 左ドラッグで領域選択; CTRL-右ドラッグでズーム; ダブルクリックでノード作成; ノード上でのダブルクリックでウェイの開始;</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>クリックで選択; CTRL-クリックで選択のオン/オフ; SHIFT-クリックで選択へ追加; SHIFT-ドラッグで領域選択; CTRL-ドラッグでズーム; ダブルクリックでノード作成; ノード上でのダブルクリックでウェイの開始;</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>関連(&a)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>フィーチャ%1の削除</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>表示(&S)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation>地物の削除</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>方向矢印の表示</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>子ノードも削除しますか?
-ダウンロード領域外のOSMノードは保持されることに注意してください。</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>メインツールバー</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation>%1ウェイを反転</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>終了(&Q)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>タイル %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>情報(&A)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>プロパティ...</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>開く(&O)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>投影法ファイルをロードできません</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>新規文書を作成して、ファイルをインポート</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>"Projections.xml" はどこからも開けませんでした。中断します。</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>薄い</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>全てズーム(&a)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>濃い</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>不透明</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>ウィンドウズーム(&w)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>ファイル</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>ズームウィンドウ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>編集</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>ビュー</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>ズームアウト(&o)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>表示</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>方向付き矢印</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>ズームイン(&i)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>ズームイン</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>レイヤー</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>作成</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>曲がったリンク</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>フィーチャ</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>元に戻す(&U)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>ノード</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>ウエイ</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>やり直す(&R)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>関連</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>ツール</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>移動(&M)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation>ウィンドウ</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>ヘルプ</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>インポート(&I)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>クリップボードが不正です</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>現在の文書にファイルをインポート</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation>地物の切り取り</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>ダウンロード(&D)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>クリップボードには有効なデータがありません。</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>新規エリアの地図データをダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>保存されていない変更</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>現在の地図には保存されていない変更があり、新しい地図を開いたときに失われます。
-新しい地図の開始をキャンセルしますか?それとも、継続して古い変更を破棄しますか?</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>リンク</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>リンクの作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>ウエイポイント</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>選択(&S)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>トラック %1</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>重大な著作権の警告</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>アップロード(&U)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>あなたはKMLファイルをインポートしようとしています。次のことを確認してください:
-
- - OSMにGoogleアースから作成したKMLファイルをインポートすることはできません。GEから作られた
-   ノードがあなたのものだと思っているかもしれませんが、そうではないのです!
-   それでも、GEからの派生物になります。だから、OSMで使えないのです。
-
- - インターネットからそれをダウンロードしたならば、変更も著作者に帰属します。
-   それらのデータがOSMで使うことを、著者によって完全に許諾されていますでしょうか。あるいは
-   データがパブリックドメインにありますか。(日本では、法的にパブリックドメインは存在しません。)
-
-もし、わからないならば、"legal"や"talk"といったopenstreetmap メーリングリストでアドバイスを求めてみてください。
-このKMLをOSMにインポートすることが、法的に完全に確認できていますか?</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>変更をサーバにアップロード</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>不正なファイルです</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 を開けません。</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>削除(&e)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>選択したフィーチャを削除</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>削除</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>古い Qt のバージョンが見つかりました</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>新規道路の作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>あなたの設定は、Qt %1を使用しています。これには、OpenStreetMapにデータをアップロードをするときに知られているいろんなエラーがあり、401サーバ応答コードになってしまうことがあります。(推奨されていませんが、)続けますか?
-さらなる情報は、http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor で知ることができます。</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>OSMのアップロード</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>新規ノードの作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>OpenStreetMapユーザ名とパスワード
-を指定していないようです。
-いま指定しますか?</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>ダウンロードエラー</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>逆転(&R)</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>道路の進行方向を反転</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>移動(&G)...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>2車線にする</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>地図をダウンロードできません。</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>2車線道の作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>OpenStreetBugsダウンロードエラー</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>OpenStreetBugsからダウンロードできません</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>ロータリーの作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>新規(&N)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>新規文書の作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>道路の結合</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>分割(&S)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>道路の分割</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>道路を分割して、複数のつながった道路とします。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>道路分割</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>道路を単純化する</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>接合(&J)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>ネットワークタイムアウト</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>接続された道路を一つの道路として結合</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>OpenStreetBugsに接続できません。</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>バグクローズエラー</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>切り離す(&B)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>バグを削除できません。サーバーメッセージは:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>分割</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>交差点を作成する</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>接続された道路を切り離す</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>街路番号を追加する</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>分割する数</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>関連(&l)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation>セグメントの数を指定してください</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>関連の作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>ウェイを%1個に分割</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>領域(&A)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation>軸合わせ</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>新規エリアの作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation>辺を合わせるための軸の数を指定してください(例えば直交なら4)</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>編集(&E)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>3角形</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>名前をつけて保存(&A)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>4角形</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>読み込み(&L)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>5角形</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>カーブ (&C)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>6角形</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>設定(&P)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>7角形</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>全て(&A)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>8角形</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>全ての表示中レイヤーをファイルに書き出す</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>%1軸に合わせる</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>検索(&F)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>%1等間隔軸に合わせる</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>検索</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation>軸に合わせられません</translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>検索とアイテムの選択</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>軸合わせ操作に失敗しました。鋭角の角を調整してもう一度試してください。</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>ビューポート...(&V)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>軸合わせ操作に失敗し、解決法が収束しませんでした。</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>ビューポートの地物をファイルにエクスポートする</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>追加(&A)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>ノードの整列</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>削除(&R)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>マージ(&M)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>ノード %1 の切り離し</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>ノードの結合</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>関連にメンバーを追加</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>選択されたノードをマージする(最初に選択されたものが残る)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>関連からメンバーの削除</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>保存(&S)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>領域を結合</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>ファイルに保存</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>領域の分割</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation>領域をテラスハウス化する %1</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>更新ダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>関連%1の作成</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>現在のエリアの地図データをダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>マップスタイルの保存</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>現在の表示範囲を、前回ダウンロードしたレイヤーにダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Merkaartorマップスタイル(*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>マップスタイルのロード</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>プロパティ(&P)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>サポートされたフォーマット</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>プロパティ枠の表示/非表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>GPS 交換フォーマット (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>OpenStreetMapフォーマット(*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>レイヤー枠の表示/非表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>OpenStreetMap change format (*.osc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Noni GPSPlotフォーマット(*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>情報(&I)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>NMEA GPSログフォーマット(*.nmea *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>情報枠の表示/非表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>KMLファイル (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>カンマ区切り形式(*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>整列(&A)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>ジオタグされた画像(*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>ノードの整列</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>ESRIシェイプファイル (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>選択したノードを整列させます。最初に選択した2つの線上にならべます。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation>Geography Markup Language (*.gml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Merkaartor文書(*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>道路</translation>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>選択されたノードを均等割り付け</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>画像を読み込む</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>やり直し枠の表示/非表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>ノードの位置をイメージに追加</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>この位置にイメージをジオタグする</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>ダウンロードした領域の表示(&d)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>キャンセル</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>コピー(&C)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Merkaartor地図スタイル (*.mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>選択したフィーチャーとタグをクリップボードにコピー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation>MapCSSスタイルシート(*.css)</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>選択した地物のタグをクリップボードにコピーします;地物がトラックポイントなら、緯度経度もコピーします。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Merkaartor文書を保存</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>タグを上書き貼り付け(&O)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>タイトルなし</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>クリップボードのタグを選択したーフィーチャーに貼り付け(し上書き)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Merkaartor文書ファイル (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>全てのファイル(*)</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>タグを追加貼り付け(&M)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>タグを貼り付け</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation>Merkaartorテンプレート文書を保存</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>クリップボードからタグを貼り付け(既存のタグに追加)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>保存ファイルを開くことができません。</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>選択したフィーチャーのタグと、クリップボードのタグを混ぜる</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 を書き込み用に開けません。</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation>テンプレート情報を保存するためにオープンできません</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>選択...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>不正なファイル</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>地物を貼り付け</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 は、ただしい Merkaartor データファイルではありません。</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>貼り付け</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>OSMのエキスポート</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>クリップボードからタグを貼り付け</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>OSM ファイル (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>クリップボードのフィーチャーを貼り付けます;もしフィーチャーIDがすでに文書にある場合は上書きされます。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>osmChangeをエクスポート</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>osmChangeファイル(*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>GPXのエキスポート</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (バイナリー形式)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPXファイル (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>強制的にアップロードする(&F)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>KMLのエキスポート</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>地物を変更レイヤーにコミットする</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KMLファイル(*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>選択した地物をアップロードできないレイヤー(トラックや展開)から「変更されたレイヤー」に移して、アップロードできるようにする</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>ツールバーのトグル</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>ツールバー枠の表示/非表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>ブックマークに追加</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>全て隠す</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>ブックマークの名前を指定</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>不正なブックマーク名</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>全て表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>ブックマークは空白にできません。</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>画像レイヤー(&I)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>警告!ブックマークの名前がすでに存在しています。</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>ラスタ/SVG(&R)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>上書きするならこのまま、さもなければ新しい名前を入力するか、キャンセルしてください。</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>ノードを表示(&n)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>ブックマークの削除</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>削除するブックマークを選択</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>名前を表示(&m)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>不正な投影法</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>投影法を"%1"に設定できませんでした。</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>開始(&S)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>GPSエラー</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>GPSの開始</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>GPSポートを開けません。</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>再生(&R)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>NMEAログファイルを開く</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>GPSの再生</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>タグテンプレートの保存</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Merkaartorタグテンプレート(*.mat)</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>GPS枠の表示/非表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>タグテンプレートを開く</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation>警告! "%1"言語用のMerkaartor翻訳ファイルを読み込めません。デフォルトの英語に切り替えます。</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>ストップ(&t)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>GPSの停止</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>ヘルプ(&H)</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>GPS位置を中心にする(&C)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>作成(&C)</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>トラックの要素を表示(&s)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>道路(&R)</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>編集(&E)</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>スケールを表示(&s)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>ビュー(&V)</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>ブックマーク(&B)</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>関連を表示(&r)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>投影法の設定(&p)</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>方向矢印の表示</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>道路の背景を表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>領域の表示濃度設定(&o)</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>道路境界を標示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>ファイル(&F)</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>パターンを表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>エクスポート(&E)</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>記録</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>最近開いたファイル(&c)</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>GPS記録</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>最近のインポート(&t)</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>一時停止</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>ツール(&T)</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>GPSを一時停止</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>スタイル(&S)</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>ジオイメージ(&e)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>ノード(&N)</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>ジオイメージ枠の表示/非表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>ウィンドウ(&W)</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>ドック (&D)</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>World OSB 管理...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>フィーチャ(&t)</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>ショートカット編集(&S)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>結合(&M)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>レイヤー(&L)</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>保存(&S)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>メンバー追加(&A)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>関連(&a)</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>メンバー削除(&R)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>表示(&S)</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>表示しない(&N)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>終了(&Q)</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>一方通行道路のみ(&O)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>情報(&A)</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>常に(&A)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>開く(&O)</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>分離(&D)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>新規文書を作成して、ファイルをインポート</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>道路からノードを切り離す</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>道路からノードを切り離す</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>全てズーム(&a)</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>オフライン作業(&W)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>ウィンドウズーム(&w)</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>スタイル(&S)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>ズームウィンドウ</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>スタイル枠の表示/非表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>ズームアウト(&o)</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>WMSサーバの編集(&W)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>TMSサーバの編集(&T)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>ズームイン(&i)</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>捨てられるダイアログ状態を初期化する (&R)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>ズームイン</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>GPSメニュー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>カメラ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>曲がったリンク</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>交差点を作成する (&J)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>元に戻す(&U)</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>回転</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>やり直す(&R)</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>移動(&M)</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>地物</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>インポート(&I)</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>街路番号(Karlsruhe scheme)を追加 (&n)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>現在の文書にファイルをインポート</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>ダウンロード(&D)</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation>セグメントを等間隔に分割する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>新規エリアの地図データをダウンロード</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation>選択されたウェイのセグメント(ウェイと隣接した二つのノード)を等間隔のセグメントに分割します。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>仮想ノードを表示(&v)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>リンク</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>緯度/経度グリッドを表示(&g)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>リンクの作成</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>背景タイルのズームを固定(&L)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>投影法エディタ(&P)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>選択(&S)</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>写真を地図に表示(&P)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>アップロード(&U)</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>強制的に削除する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>変更をサーバにアップロード</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>削除(&e)</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>単純化(&S)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>選択したフィーチャを削除</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>道路を単純化する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>削除</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>不要な子ノードを削除することで道路を単純化します</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>新規道路の作成</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>フィルタエディタ(&F)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>なし(&N)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>新規ノードの作成</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation>領域を結合(&J)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation>接している領域を結合</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>逆転(&R)</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation>接している領域を結合する。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>道路の進行方向を反転</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>領域を分割する(&S)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>移動(&G)...</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation>領域を二つのノードで分割する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation>選択された領域を、選択された二つのノードの間で、二つの領域に分割します。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>2車線にする</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>テラスハウス(&T)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>2車線道の作成</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation>領域をテラスハウス化する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>ロータリーの作成</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation>選択された領域をテラスハウスに分割します。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>新規(&N)</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation>ツールバーの編集...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>新規文書の作成</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation>軸を合わせる(&A)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>分割(&S)</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation>等間隔の軸に端を合わせる</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>道路を分割して、複数のつながった道路とします。</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation>等間隔に空いた軸に端を合わせる</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>印刷(&P)...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>接合(&J)</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation>印刷プレビュー...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>接続された道路を一つの道路として結合</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>プロパティ...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation>変更した地物をハイライトする(&y)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>切り離す(&B)</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>分割</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation>切り取り(&t)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>接続された道路を切り離す</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>関連(&l)</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation>押し出し(&E)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>関連の作成</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation>ウェイ押し出し(JOSM形式)の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>領域(&A)</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>新規エリアの作成</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation>トグルを選択</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>編集(&E)...</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation>選択に子ノードも含む</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>保存(&S)...</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>拡大縮小</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>読み込み(&L)...</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation>テンプレート文書として保存...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>カーブ (&C)</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>設定(&P)...</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>全て(&A)...</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>全ての表示中レイヤーをファイルに書き出す</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>検索(&F)...</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>検索</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>検索とアイテムの選択</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>ビューポート...(&V)</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>ビューポートの地物をファイルにエクスポートする</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>不足している子要素をダウンロードする</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>追加(&A)...</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>削除(&R)...</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>マージ(&M)</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>%2のタグ'%1'をクリアー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>ノードの結合</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>%2の%1タグをクリア</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>選択されたノードをマージする(最初に選択されたものが残る)</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation>%1に"source"タグを設定</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>%2のメンバー'%1'の削除</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>名前をつけて保存(&A)...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>関連%1のメンバーを再整列する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>保存(&S)</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>リレーションが修正されました。 %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>ファイルに保存</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>ノード作成の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>道路にノードを作成する: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>更新ダウンロード</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>領域作成の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>現在のエリアの地図データをダウンロード</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>エリア %1 を作成する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>現在の表示範囲を、前回ダウンロードしたレイヤーにダウンロード</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>領域: 道路作成 %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>穴の追加</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>プロパティ(&P)</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>この領域に穴を追加しますか?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>プロパティ枠の表示/非表示</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>領域: 道路終了 %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>エリア: ノード %1 を道路 %2 に追加</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>レイヤー枠の表示/非表示</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>領域%1を閉じる</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>情報(&I)</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>2車線道路%1にノードを追加</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>情報枠の表示/非表示</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>2車線道路%1を作成する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>POI %1 を作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>整列(&A)</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>左クリックで開始; ドラッグで拡大縮小; SHIFT-ドラッグで回転; 左クリックで終了</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>ノードの整列</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>多角形作成の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>選択したノードを整列させます。最初に選択した2つの線上にならべます。</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>多角形 %1 を作成する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>ラウンドアバウト作成の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>ロータリー%1の作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>ウェイ作成の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>選択されたノードを均等割り付け</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>道路 %2 にノード %1 を作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>やり直し枠の表示/非表示</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>道路%1の作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>ノード作成:%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>ダウンロードした領域の表示(&d)</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>ノード %1 を 道路 %2 に追加</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>道路%1を閉じる</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>コピー(&C)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>左クリックで選択; 右クリックでスクロール; CTRL-左クリックで選択のオン/オフ; SHIFT-左クリックで選択へ追加; 左ドラッグで領域選択; CTRL-右ドラッグでズーム; ダブルクリックでノード作成; ノード上でのダブルクリックでウェイの開始;</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>選択したフィーチャーとタグをクリップボードにコピー</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>クリックで選択; CTRL-クリックで選択のオン/オフ; SHIFT-クリックで選択へ追加; SHIFT-ドラッグで領域選択; CTRL-ドラッグでズーム; ダブルクリックでノード作成; ノード上でのダブルクリックでウェイの開始;</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>選択した地物のタグをクリップボードにコピーします;地物がトラックポイントなら、緯度経度もコピーします。</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>編集の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>フィーチャ%1の削除</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>タグを上書き貼り付け(&O)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>地物の削除</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>クリップボードのタグを選択したーフィーチャーに貼り付け(し上書き)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>子の削除</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>子ノードも削除しますか?
+ダウンロード領域外のOSMノードは保持されることに注意してください。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>タグを追加貼り付け(&M)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>%1ウェイを反転</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>タグを貼り付け</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation>ウェイ%1の押し出し</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>クリップボードからタグを貼り付け(既存のタグに追加)</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>左クリックで選択; 左ドラッグで移動</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>選択したフィーチャーのタグと、クリップボードのタグを混ぜる</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>ノード移動の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>ノードの移動</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>選択...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>ノード%1の移動</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>同じ位置のノードが見つかりました。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>ドロップした位置の全てのノードをマージしますか?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>ノードを%1にマージします</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation>マウスカーソルを置くと選択; 左ドラッグで回転</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation>選択された領域を、選択された二つのノードの間で、二つの領域に分割します。</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>回転の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation>軸を合わせる(&A)</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation>地物を回転</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation>等間隔の軸に端を合わせる</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation>マウスカーソルを置くと選択; 左ドラッグで拡大縮小</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation>等間隔に空いた軸に端を合わせる</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation>拡大縮小の説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>印刷(&P)...</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation>地物を拡大縮小</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation>印刷プレビュー...</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>左クリックで最初の角->左ドラッグで領域指定->左クリックでズーム</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation>変更した地物をハイライトする(&y)</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>ズームの説明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>GPS 交換フォーマット (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>OpenStreetMapフォーマット(*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>OpenStreetMap change format (*.osc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Noni GPSPlotフォーマット(*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>NMEA GPSログフォーマット(*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>KMLファイル (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>カンマ区切り形式(*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>ジオタグされた画像(*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>ESRIシェイプファイル (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation>Geography Markup Language (*.gml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>不足している子要素をダウンロードする</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>サポートされたフォーマット</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation>切り取り(&t)</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Merkaartor文書(*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>全てのファイル(*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation>押し出し(&E)</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>タイル %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation>ウェイ押し出し(JOSM形式)の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>投影法ファイルをロードできません</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation>Alt+X</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projections.xml" はどこからも開けませんでした。中断します。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation>トグルを選択</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>薄い</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation>選択に子ノードも含む</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>濃い</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>拡大縮小</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>不透明</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation>テンプレート文書として保存...</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>フィーチャ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>貼り付け</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>ノード</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>クリップボードからタグを貼り付け</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>道路</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>クリップボードのフィーチャーを貼り付けます;もしフィーチャーIDがすでに文書にある場合は上書きされます。</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>関連</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>画像を読み込む</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>ノードの位置をイメージに追加</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (バイナリー形式)</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>この位置にイメージをジオタグする</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>地物を変更レイヤーにコミットする</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>選択した地物をアップロードできないレイヤー(トラックや展開)から「変更されたレイヤー」に移して、アップロードできるようにする</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>ファイル</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>編集</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>ビュー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>ツールバーのトグル</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>表示</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>ツールバー枠の表示/非表示</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>方向付き矢印</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>全て隠す</translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>レイヤー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>全て表示</translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>画像レイヤー(&I)</translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>ウエイ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>WMSサーバの編集(&W)...</translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>ツール</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>TMSサーバの編集(&T)...</translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation>ウィンドウ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation>セグメントを等間隔に分割する</translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation>地物の切り取り</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation>選択されたウェイのセグメント(ウェイと隣接した二つのノード)を等間隔のセグメントに分割します。</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>クリップボードが不正です</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>単純化(&S)</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>クリップボードには有効なデータがありません。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>道路を単純化する</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>不要な子ノードを削除することで道路を単純化します</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>保存されていない変更</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>フィルタエディタ(&F)...</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>現在の地図には保存されていない変更があり、新しい地図を開いたときに失われます。
+新しい地図の開始をキャンセルしますか?それとも、継続して古い変更を破棄しますか?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>なし(&N)</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation>領域を結合(&J)</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation>接している領域を結合</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>ウエイポイント</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation>接している領域を結合する。</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>トラック %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>領域を分割する(&S)</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>重大な著作権の警告</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation>領域を二つのノードで分割する</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>あなたはKMLファイルをインポートしようとしています。次のことを確認してください:
+
+ - OSMにGoogleアースから作成したKMLファイルをインポートすることはできません。GEから作られた
+   ノードがあなたのものだと思っているかもしれませんが、そうではないのです!
+   それでも、GEからの派生物になります。だから、OSMで使えないのです。
+
+ - インターネットからそれをダウンロードしたならば、変更も著作者に帰属します。
+   それらのデータがOSMで使うことを、著者によって完全に許諾されていますでしょうか。あるいは
+   データがパブリックドメインにありますか。(日本では、法的にパブリックドメインは存在しません。)
+
+もし、わからないならば、"legal"や"talk"といったopenstreetmap メーリングリストでアドバイスを求めてみてください。
+このKMLをOSMにインポートすることが、法的に完全に確認できていますか?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>テラスハウス(&T)</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>不正なファイルです</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation>領域をテラスハウス化する</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 を開けません。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation>選択された領域をテラスハウスに分割します。</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation>ツールバーの編集...</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>ラスタ/SVG(&R)</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation>タグテンプレート(&g)</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>メインツールバー</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>複数のファイルを開く</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>古い Qt のバージョンが見つかりました</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>あなたの設定は、Qt %1を使用しています。これには、OpenStreetMapにデータをアップロードをするときに知られているいろんなエラーがあり、401サーバ応答コードになってしまうことがあります。(推奨されていませんが、)続けますか?
+さらなる情報は、http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor で知ることができます。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>開始(&S)</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>OSMのアップロード</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>GPSの開始</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>OpenStreetMapユーザ名とパスワード
+を指定していないようです。
+いま指定しますか?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>再生(&R)</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>ダウンロードエラー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>GPSの再生</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>地図をダウンロードできません。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>OpenStreetBugsダウンロードエラー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>GPS枠の表示/非表示</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>OpenStreetBugsからダウンロードできません</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>ストップ(&t)</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>GPSの停止</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>多角形を作成する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>GPS位置を中心にする(&C)</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>辺の数を指定してください</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>トラックの要素を表示(&s)</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>道路の結合</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>道路の分割</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>スケールを表示(&s)</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>道路分割</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>道路を単純化する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>関連を表示(&r)</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>地物を強制的にアップロードする</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>ネットワークタイムアウト</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>道路の背景を表示</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>OpenStreetBugsに接続できません。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>道路境界を標示</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>バグクローズエラー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>パターンを表示</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>バグを削除できません。サーバーメッセージは:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>記録</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>交差点を作成する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>GPS記録</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>複数交差</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>一時停止</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>これらの道路には複数の交差があります。
+それでもそれぞれに交差点を造りますか?(不要な交差点は後で削除できます)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>GPSを一時停止</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>街路番号を追加する</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>ジオイメージ(&e)</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>分割する数</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>ジオイメージ枠の表示/非表示</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation>セグメントの数を指定してください</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>ウェイを%1個に分割</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>World OSB 管理...</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation>軸合わせ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>ショートカット編集(&S)...</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation>辺を合わせるための軸の数を指定してください(例えば直交なら4)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>結合(&M)...</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>3角形</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>メンバー追加(&A)</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>4角形</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>メンバー削除(&R)</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>5角形</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>表示しない(&N)</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>6角形</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>一方通行道路のみ(&O)</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>7角形</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>常に(&A)</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>8角形</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>分離(&D)</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>%1軸に合わせる</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>道路からノードを切り離す</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>%1等間隔軸に合わせる</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>道路からノードを切り離す</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation>軸に合わせられません</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>オフライン作業(&W)</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>軸合わせ操作に失敗しました。鋭角の角を調整してもう一度試してください。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>軸合わせ操作に失敗し、解決法が収束しませんでした。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>スタイル(&S)</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>スタイル枠の表示/非表示</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>ノードの整列</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>捨てられるダイアログ状態を初期化する (&R)</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>ノード %1 の切り離し</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>GPSメニュー</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>関連にメンバーを追加</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>カメラ</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>関連からメンバーの削除</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>交差点を作成する (&J)</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>街路番号(Karlsruhe scheme)を追加 (&n)</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>領域を結合</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>緯度/経度グリッドを表示(&g)</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>領域の分割</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>背景タイルのズームを固定(&L)</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation>領域をテラスハウス化する %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>投影法エディタ(&P)...</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>関連%1の作成</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>写真を地図に表示(&P)</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>マップスタイルの保存</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Merkaartorマップスタイル(*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>強制的に削除する</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>マップスタイルのロード</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>閉じる</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Merkaartor地図スタイル (*.mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>リレーションが修正されました。 %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation>MapCSSスタイルシート(*.css)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>子の削除</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>%2のメンバー'%1'の削除</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>解決できない矛盾</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>タイトルなし</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>既存の矛盾を先に解決してください。</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Merkaartor文書を保存</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>アップロード後に、これら変更をあなたの文書として保存することを強く推奨します。
-そうしますか?</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Merkaartor文書ファイル (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>複数のフィーチャーのタグを設定</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation>Merkaartorテンプレート文書を保存</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>%1にタグを設定</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>保存ファイルを開くことができません。</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>領域作成の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 を書き込み用に開けません。</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>ノード作成の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation>テンプレート情報を保存するためにオープンできません</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>左クリックで開始; ドラッグで拡大縮小; SHIFT-ドラッグで回転; 左クリックで終了</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>不正なファイル</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>多角形作成の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 は、ただしい Merkaartor データファイルではありません。</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>多角形 %1 を作成する</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>OSMのエキスポート</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>ラウンドアバウト作成の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>OSM ファイル (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>ウェイ作成の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>osmChangeをエクスポート</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>編集の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>osmChangeファイル(*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>ノードの移動</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>GPXのエキスポート</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>ノード%1の移動</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPXファイル (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>左クリックで選択; 左ドラッグで移動</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>KMLのエキスポート</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>ノード移動の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KMLファイル(*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation>マウスカーソルを置くと選択; 左ドラッグで回転</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>回転の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation>地物を回転</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>左クリックで最初の角->左ドラッグで領域指定->左クリックでズーム</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>ズームの説明</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>ブックマークに追加</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>多角形を作成する</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>ブックマークの名前を指定</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>辺の数を指定してください</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>不正なブックマーク名</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>地物を強制的にアップロードする</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>ブックマークは空白にできません。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>強制的にアップロードする(&F)</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>警告!ブックマークの名前がすでに存在しています。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>ノードを表示(&n)</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>上書きするならこのまま、さもなければ新しい名前を入力するか、キャンセルしてください。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>名前を表示(&m)</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>ブックマークの削除</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>回転</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>削除するブックマークを選択</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>不正な投影法</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>複数のファイルを開く</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>投影法を"%1"に設定できませんでした。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>複数交差</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>GPSエラー</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>これらの道路には複数の交差があります。
-それでもそれぞれに交差点を造りますか?(不要な交差点は後で削除できます)</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>GPSポートを開けません。</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>地物を貼り付け</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>NMEAログファイルを開く</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>地物</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>タグテンプレートの保存</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>仮想ノードを表示(&v)</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Merkaartorタグテンプレート(*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>%2の%1タグをクリア</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>タグテンプレートを開く</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>関連%1のメンバーを再整列する</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation>警告! "%1"言語用のMerkaartor翻訳ファイルを読み込めません。デフォルトの英語に切り替えます。</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation>ウェイ%1の押し出し</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>解決できない矛盾</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation>マウスカーソルを置くと選択; 左ドラッグで拡大縮小</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>既存の矛盾を先に解決してください。</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation>拡大縮小の説明</translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>アップロード後に、これら変更をあなたの文書として保存することを強く推奨します。
+そうしますか?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation>地物を拡大縮小</translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>複数のフィーチャーのタグを設定</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation>%1に"source"タグを設定</translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>%1にタグを設定</translation>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>last: </i><b>%1</b> by <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation><i>last: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
         <translation><br/><i>レイヤー: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>ウエイポイント</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>coord</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>記述</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>コメント</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>ノード</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>高度</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>速度</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>サイズ</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>メンバー</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>左上</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>右下</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>関連</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>役割</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>メンバー</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
         <translation>閉じたウェイ</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>距離</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>サイズ</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>%1 ノード</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>ウエイ</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>エリア</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>coord</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>高度</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>速度</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>記述</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>ウエイ</translation>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>コメント</translation>
+        <location filename="../src/common/MapView.cpp" line="339"/>
+        <source>%1 m/pixel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>ウエイポイント</translation>
+        <location filename="../src/common/MapView.cpp" line="345"/>
+        <source>Align: %1m @ %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>ノード</translation>
+        <location filename="../src/common/MapView.cpp" line="351"/>
+        <source>%1ms</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="384"/>
         <source>%1 m</source>
@@ -4758,32 +4792,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="339"/>
-        <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="345"/>
-        <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="351"/>
-        <source>%1ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation>ビュー</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
         <translation>境界</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>投影法</translation>
     </message>
@@ -4797,22 +4816,32 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>新規ブックマーク</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>設定のアップロード失敗</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>重複したキー</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>150以上の設定項目</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
         <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
         <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
@@ -4847,17 +4876,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>クラス</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>不明なフィールド</translation>
     </message>
@@ -4870,25 +4899,10 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>エラー!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>地名検索サービスのサーバが見つかりません。</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>地名検索サービスのサーバが接続を拒否しました。</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>地名検索サービスは、認証が必要です。</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>不明なエラー。</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4909,11 +4923,6 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation>PDFファイル(*.pdf)</translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4921,6 +4930,11 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation>PDFファイル(*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -5032,25 +5046,6 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>常に</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>色の選択</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>マップスタイル編集</translation>
@@ -5083,6 +5078,31 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>比例幅</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>固定幅</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
         <translation>フィルタ</translation>
@@ -5116,44 +5136,19 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
         <source>Visible up to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
-        <source>Visible from scale</source>
-        <translation>スケールから見える</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="775"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1347"/>
-        <source>Draw with color</source>
-        <translation>カラーで表示</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>比例幅</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
+        <source>Visible from scale</source>
+        <translation>スケールから見える</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>固定幅</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="775"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1347"/>
+        <source>Draw with color</source>
+        <translation>カラーで表示</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
@@ -5185,12 +5180,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5210,7 +5205,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5247,6 +5242,25 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <source>Label with background tag</source>
         <translation>背景タグのラベル</translation>
     </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>常に</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>色の選択</translation>
+    </message>
 </context>
 <context>
     <name>PhotoLoadErrorDialog</name>
@@ -5296,6 +5310,11 @@ What do you want to do next?</source>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>ダイアログ</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5303,17 +5322,17 @@ What do you want to do next?</source>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVGファイル (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>untitled</source>
         <translation>タイトルなし</translation>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>SVGファイル (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
         <translation>全てのファイル(*)</translation>
@@ -5323,180 +5342,15 @@ What do you want to do next?</source>
         <source>Image files (*.png *.jpg)</source>
         <translation>画像ファイル (*.png *.jpg)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>ダイアログ</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>英語</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>アラビア数字</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Czech</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>German</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>フランス語</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation>ハンガリー語</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Italian</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation>日本語</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation>Polish</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>ポルトガル語(ブラジル)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Russian</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>カスタムスタイルディレクトリ</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>タグのテンプレート</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartorタグテンプレート(*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>色の選択</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>ツールがすでに存在します</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>この名前のツールはすでに存在しています。
-他の名前を選択するか、既存の名前を変更して<適用>ボタンをおしてください。</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>プリセットツールを削除できません</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>プリセットツール"%1"を削除できません</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>プリセットツールの名前を変更できません</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>プリセットツールの"%1"の名前を変更できません。</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>ツールの実行ファイルを選択</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation>テンプレート文書を選択</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation>Merkaartor文書(*.mdc)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>ログディレクトリを選択</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
         <source>Preferences</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>地域</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>これらの変更が有効になるには、プログラムを再起動する必要があるかもしれません。</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>多国語を使う</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>標準タグを翻訳</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
         <source>Visual</source>
         <translation>外観</translation>
@@ -5517,11 +5371,6 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>表示濃度の濃淡</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>分離移動モード</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
         <translation>シングルクリックでマウス操作</translation>
@@ -5532,6 +5381,26 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>カスタムQtスタイルを使う</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation>選択モードでノード/ウェイ作成を可能にする</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>分離移動モード</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>仮想ノードを使用する(新しいセッションが必要)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>隠れている関連を選択可能にする</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
         <source>Colors</source>
         <translation>配色</translation>
@@ -5563,9 +5432,9 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>スタイルの上書き</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>上にある時</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>GPXトラック</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5578,79 +5447,64 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>ピクセル</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>フォーカス</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>関連</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>マップスタイル</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>現在のスタイル</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>シンプルなGPXトラック表現を使う</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>トラックレイヤーのスタイルを無効にする</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>インターフェース</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>テンプレート</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>上にある時</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>内蔵</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>関連</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>カスタム</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>フォーカス</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>データ</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>ハイライト</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation>テンプレート文書を自動的に読み込む</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation>変更</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>パスワード:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>地域</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>文書</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>これらの変更が有効になるには、プログラムを再起動する必要があるかもしれません。</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation>選択モードでノード/ウェイ作成を可能にする</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>多国語を使う</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation>変更</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>標準タグを翻訳</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
@@ -5660,42 +5514,89 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>マップスタイル</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>カスタムスタイルディレクトリ</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>現在のスタイル</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>トラックレイヤーのスタイルを無効にする</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>テンプレート</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>タグのテンプレート</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>内蔵</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>カスタム</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>データ</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
@@ -5716,7 +5617,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>文書</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation>テンプレート文書を自動的に読み込む</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
@@ -5746,12 +5657,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5759,6 +5670,32 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>GPS</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>GPS入力</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>シリアル</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>ポート</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>ホスト</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
         <translation>NMEAログを保存</translation>
@@ -5784,6 +5721,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>プロキシーを使う</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>パスワード:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
         <source>User:</source>
         <translation>ユーザ:</translation>
@@ -5801,7 +5743,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
@@ -5869,90 +5811,156 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>ハイライト</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>英語</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>GPXトラック</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>アラビア数字</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>シンプルなGPXトラック表現を使う</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>GPS入力</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Czech</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>オランダ語</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>シリアル</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>German</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>ポート</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>フランス語</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>ホスト</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation>ハンガリー語</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>仮想ノードを使用する(新しいセッションが必要)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Italian</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation>日本語</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation>Polish</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>ポルトガル語</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>ポルトガル語(ブラジル)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Russian</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>スロバキア語</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>スペイン語</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>スウェーデン語</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>ウクライナ語</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartorタグテンプレート(*.mat)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>色の選択</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>ツールがすでに存在します</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>この名前のツールはすでに存在しています。
+他の名前を選択するか、既存の名前を変更して<適用>ボタンをおしてください。</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>オランダ語</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>プリセットツールを削除できません</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>ポルトガル語</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>プリセットツール"%1"を削除できません</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>スロバキア語</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>プリセットツールの名前を変更できません</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>スペイン語</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>プリセットツールの"%1"の名前を変更できません。</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>スウェーデン語</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>ツールの実行ファイルを選択</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>ウクライナ語</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation>テンプレート文書を選択</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>隠れている関連を選択可能にする</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation>Merkaartor文書(*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>インターフェース</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>ログディレクトリを選択</translation>
     </message>
 </context>
 <context>
@@ -6005,7 +6013,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6041,25 +6049,25 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6093,6 +6101,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>プロパティ - 複数要素</translation>
     </message>
     <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>プロパティ - ノード</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
         <translation>プロパティ - 道路</translation>
@@ -6128,41 +6141,13 @@ Please select another name or click the <Apply> button if you want to modi
         <source>Select member</source>
         <translation>メンバーを選択</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>プロパティ - ノード</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation>GPXをエクスポート中...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>キャンセル</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation>インポート中...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="66"/>
@@ -6185,7 +6170,30 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>ノード %1 の移動</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation>GPXをエクスポート中...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation>インポート中...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>osmChangeをインポート</translation>
     </message>
@@ -6195,31 +6203,31 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>NGTのインポート</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>NMEAのインポート</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6235,14 +6243,14 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6272,7 +6280,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6283,12 +6291,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>GPSログエラー</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>GPSログファイル %1を作成できません。</translation>
     </message>
@@ -6296,17 +6304,17 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>%1に接続できない:%2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>GPSログエラー</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>GPSログファイル %1を作成できません。</translation>
     </message>
@@ -6392,95 +6400,139 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation><区切り></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>ツールバーをカスタマイズ</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>アクション</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation>ツールバー</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>新規</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>名前の変更</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation>全てを元に戻す</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>適用</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>上</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
         <translation>現在のツールバーアクション</translation>
     </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation><区切り></translation>
+    </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation>カスタムツールバー</translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6605,6 +6657,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>名前</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
         <translation>クエリ</translation>
@@ -6614,11 +6671,6 @@ Please select another name or click the <Apply> button if you want to modi
         <source>Maximum returned results (0 for all)</source>
         <translation>返される結果の最大値(0は全て)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Id</translation>
-    </message>
 </context>
 <context>
     <name>SlippyMapWidget</name>
@@ -6631,12 +6683,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
@@ -6727,7 +6779,7 @@ Please select another name or click the <Apply> button if you want to modi
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6741,6 +6793,21 @@ p, li { white-space: pre-wrap; }
         <translation>投影法:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>緯度/経度(EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>原点は左下</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
         <translation>タイルサイズ</translation>
@@ -6766,21 +6833,6 @@ p, li { white-space: pre-wrap; }
         <translation>ライセンス URL:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>緯度/経度(EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>原点は左下</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
         <translation>適用</translation>
@@ -6796,24 +6848,18 @@ p, li { white-space: pre-wrap; }
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: GetServices</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>アドレスやパスは空白にできません</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>ダウンロード失敗: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>サービス読み込み時のエラー。
@@ -6858,7 +6904,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6868,12 +6914,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6953,55 +6999,55 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>展開中 - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation>トラックセグメント数</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>合計距離</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>合計時間</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1時間 %2分</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>展開中 - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>描画レイヤーに展開する</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>ズーム</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
@@ -7100,12 +7146,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>ズーム</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>クリア</translation>
     </message>
@@ -7113,35 +7159,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: GetCapabilities</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>アドレスやパスは空白にできません</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>ダウンロード失敗: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation>名称未設定</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>capabilitiesの読み込みでエラーが発生しました。
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>WMSサーバ設定</translation>
@@ -7162,31 +7179,26 @@ p, li { white-space: pre-wrap; }
         <translation>名前:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>サーバURL:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>レイヤー:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>投影法:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>画像形式:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>スタイル:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -7195,6 +7207,11 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>投影法:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
         <translation>タイル表示</translation>
@@ -7205,6 +7222,16 @@ p, li { white-space: pre-wrap; }
         <translation>ズームレベル</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation>画像形式:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>スタイル:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
         <translation>"source"タグの値:</translation>
@@ -7230,14 +7257,33 @@ p, li { white-space: pre-wrap; }
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>サーバURL:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: GetCapabilities</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>アドレスやパスは空白にできません</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>capabilitiesの読み込みでエラーが発生しました。
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>ダウンロード失敗: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation>名称未設定</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_nl.ts b/translations/merkaartor_nl.ts
index dff4bde..b1e9ab2 100644
--- a/translations/merkaartor_nl.ts
+++ b/translations/merkaartor_nl.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="nl">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,47 +24,47 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished"></translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
         <translation>Dit programma valt onder de GNU Public Licentie v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//NL" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -75,12 +73,12 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Overzicht van wijzigingen</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -88,93 +86,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importeer</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Exporteren</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Standaard</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Annuleren</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Laad Snelkoppeling thema</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Merkaartor snelkoppeling schema (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Het is niet mogelijk om het bestand te openen</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 kon niet worden geopend</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>zonder titel</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Alle bestanden (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 kon niet worden geopend om te schrijven.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -228,10 +256,7 @@ p, li { white-space: pre-wrap; }
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform>Er is <b>%n</b> gewijzigd object</numerusform>
-            <numerusform>Er zijn <b>%n</b> gewijzigde objecten</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -261,7 +286,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//NL" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -278,7 +303,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Zoomen</translation>
     </message>
@@ -307,7 +332,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="350"/>
         <location filename="../src/Sync/DirtyList.cpp" line="701"/>
         <source>UPDATE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="358"/>
@@ -415,7 +440,7 @@ API-boodschap is '%1'</translation>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
@@ -460,7 +485,7 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="428"/>
         <source>UPDATE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="442"/>
@@ -481,97 +506,97 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>zonder titel</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Wijzigingen laag</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Doorgestuurde laag</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Achtergrondafbeeldingen</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation>Tekenlaag #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation>Filterlaag #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>OSM Export</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Exporteren naar OSM...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Document</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -599,12 +624,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -619,250 +644,239 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="119"/>
         <source>Resolve all relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Download mislukt</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 download</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>fout</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Downloaden ongebonden...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Downloaden ongebonden %1 van %2</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Verwerken ongebonden %1 van %2</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Verwerken...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>Inlezen XML</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Conflicten van %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Lege wegen/relaties gevonden</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Lege wegen/relaties zijn mogelijke fouten.
+Wil je deze markeren om te verwijderen?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Verwijder lege kenmerk %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>Er zijn conflicten gevonden</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation>Dit betekent dat een aantal van de elementen die u heeft gewijzigd sinds uw laatste download, ondertussen werden gewijzigd op de server door iemand anders.
+De elementen werden gedupliceerd op de conflictenlaag.
+Voordat u uw wijzigingen zal kunnen doorsturen naar de server, moet u eerst manueel de twee versies samenvoegen en verwijderen van de conflictenlaag.</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Aan het doorsturen...</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Voorbereiding van wijzigingen</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Wachten op antwoord van de server</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>er werd niet voldoende afgehaald van de server</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>fout</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Downloaden van OSM (%n byte)</numerusform>
-            <numerusform>Downloaden van OSM (%n bytes)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Downloaden van OSM (%n kByte)</numerusform>
-            <numerusform>Downloaden van OSM (%n kBytes)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
         <source>Downloading...</source>
         <translation>Bezig met downloaden...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
         <source>Downloading from OSM (connecting)</source>
         <translation>Downloaden van OSM (verbinden)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation>Onverwachte HTTP-status code (%1)
 De boodschap van de server is '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 API-boodschap is '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Download mislukt</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
         <source>Username/password invalid</source>
         <translation>Gebruikersnaam/wachtwoord fout</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Unresolved conflicts</source>
         <translation>Onopgeloste conflicten</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Please resolve existing conflicts first</source>
         <translation>Los eerst bestaande conflicten op</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Punten aan het downloaden</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Verwerken...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>Inlezen XML</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
         <source>Downloading trackpoints %1-%2</source>
         <translation>Downloaden trackpunten %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
         <source>Downloaded track - nodes %1-%2</source>
         <translation>Gedownloade track - nodes %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 download</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Downloaden ongebonden...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Downloaden ongebonden %1 van %2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Verwerken ongebonden %1 van %2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Conflicten van %1</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>Er zijn conflicten gevonden</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation>Dit betekent dat een aantal van de elementen die u heeft gewijzigd sinds uw laatste download, ondertussen werden gewijzigd op de server door iemand anders.
-De elementen werden gedupliceerd op de conflictenlaag.
-Voordat u uw wijzigingen zal kunnen doorsturen naar de server, moet u eerst manueel de twee versies samenvoegen en verwijderen van de conflictenlaag.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Lege wegen/relaties gevonden</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Lege wegen/relaties zijn mogelijke fouten.
-Wil je deze markeren om te verwijderen?</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Punten aan het downloaden</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Verwijder lege kenmerk %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
         <source>Downloading %1,%2 (zoom %3)...</source>
         <translation>Downloaden van %1,%2 (zoom %3)...</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Aan het doorsturen...</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Voorbereiding van wijzigingen</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Wachten op antwoord van de server</translation>
-    </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Sluiten</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Zoomen</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Sluiten</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation>Verwijderen niet mogelijk</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
         <translation>Kan niet alles verwijderen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
         <translation>Weg %1 omkeren</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
         <translation>%1 wegen omkeren</translation>
     </message>
@@ -887,7 +901,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="45"/>
         <source>Viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="52"/>
@@ -918,6 +932,11 @@ Delete what can be?</source>
         <translation>Download ontbrekende relaties</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Aan selectie toevoegen</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Verwijderen</translation>
@@ -942,11 +961,6 @@ Delete what can be?</source>
         <source>All</source>
         <translation>Alles</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Aan selectie toevoegen</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -968,7 +982,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -997,7 +1011,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
@@ -1053,235 +1067,235 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Kan de foto details van de Walking Paper server niet lezen.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Gelieve the URL op te geven waar de Walking Papers zich bevinden</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Geo afbeeldingen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Centreer de kaart</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Verwijder afbeeldingen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Kopieer bestandsnaam naar klembord</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
         <translation>Selecteer volgende afbeelding</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
         <translation>PgDown</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
         <translation>Selecteer vorige afbeelding</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
         <translation>PgUp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Geogerefeerde afbeelding opslaan...</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Fotolaag</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Laad afbeeldingen die geografische referenties (geotags) bevatten</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>Selecteer tot welke laag de afbeeldingen behoren:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Afbeeldingen laden....</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Laden afbreken</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation>Bestand bestaat niet</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>Kan afbeelding "%1" niet vinden</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation>Fout bij het openen van "%2":
 %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
         <translation>Fout bij het lezen van EXIF-data van "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
+        <source>Specify offset</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Kan de foto details van de Walking Paper server niet lezen.</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
+        <source>Position images more to the:</source>
+        <translation>Plaats afbeeldingen meer naar:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Gelieve the URL op te geven waar de Walking Papers zich bevinden</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
+        <source>end of the track</source>
+        <translation>einde van het spoor</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
+        <source>beginning of the track</source>
+        <translation>Begin van het spoor</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Centreer de kaart</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
+        <source>hh:mm:ss</source>
+        <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Geogerefeerde afbeelding opslaan...</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Fotolaag</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
-        <source>Specify offset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
-        <source>Position images more to the:</source>
-        <translation>Plaats afbeeldingen meer naar:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
-        <source>end of the track</source>
-        <translation>einde van het spoor</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
-        <source>beginning of the track</source>
-        <translation>Begin van het spoor</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
-        <source>hh:mm:ss</source>
-        <translation>hh:mm:ss</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints</source>
         <translation>Geen TrackPunten</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints found for image "%1"</source>
         <translation>Geen TrackPunten gevonden voor afbeelding "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'seconden'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'minuten en' ss 'seconden'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'uren,' mm 'minuten en' ss 'seconden'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>Verkeerde afbeelding?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Afbeelding "%1" is %2 gemaakt voordat het eerste routepunt was opgeslagen.
 Wenst u er nog steeds gebruik van te maken?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Afbeelding "%1" is %2 gemaakt nadat het laatste routepunt was opgeslagen.
 Wenst u deze nog steeds te gebruiken?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation>JPEG afbeeldingen (*.jpg)</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation>JPEG afbeeldingen (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Fout bij het openen van "%1":
@@ -1291,32 +1305,6 @@ Wenst u deze nog steeds te gebruiken?</translation>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Onjuiste OSM url</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>Het opgegeven adres is niet geldig!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Onjuist Coördinatenformaat</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Coördinaten als: '<links lon>, <onder lat>, <rechts lon>, <boven lat>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Coördinaten als: '<midden lat>, <midden lon>, <breedte lat>, <bleedte lon>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Ga Naar</translation>
@@ -1329,27 +1317,27 @@ Wenst u deze nog steeds te gebruiken?</translation>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
         <source>lonMin, latMin, lonMax, latMax</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="134"/>
         <source>latCent, lonCent, latSpan, lonSpan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="156"/>
@@ -1372,51 +1360,77 @@ Wenst u deze nog steeds te gebruiken?</translation>
         <source>Search</source>
         <translation>Opzoeken</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Onjuiste OSM url</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>Het opgegeven adres is niet geldig!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Onjuist Coördinatenformaat</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Coördinaten als: '<links lon>, <onder lat>, <rechts lon>, <boven lat>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Coördinaten als: '<midden lat>, <midden lon>, <breedte lat>, <bleedte lon>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Zoomen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>WMS adapter</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>TMS adapter</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>Invoegtoepassingen</translation>
     </message>
@@ -1424,71 +1438,71 @@ Wenst u deze nog steeds te gebruiken?</translation>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Kaart - Geen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Kaart - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Kaart - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Kaart - WMS-Tegels - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Kaart - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Kaart - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation>Licentievoorwaarden: %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation>De licentievoorwaarden werden niet aanvaard</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Tegelgrootte</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation>Min/Max zoomniveau</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Projectie</translation>
     </message>
@@ -1496,105 +1510,6 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Geheel getal</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Lengtegraad</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Breedtegraad</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Onjuiste projectie</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Het is niet mogelijk om de projectie in te stellen.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Geen coördinaten</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Veld voor breedte- of lengtegraad ontbreekt. Het is onmogelijk om dit bestand te importeren.
-Wenst u echt te stoppen?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Laad CSV importeerinstellingen</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Merkaartor instellingen voor importeren (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Onjuist bestand</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 kon niet worden geopend</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>CSV-importeerinstellingen opslaan</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>zonder titel</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Alle bestanden (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 kon niet worden geopend om te schrijven.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialoog</translation>
@@ -1609,7 +1524,7 @@ Wenst u echt te stoppen?</translation>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1617,12 +1532,12 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
@@ -1662,7 +1577,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1672,12 +1587,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
@@ -1734,93 +1649,159 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Instellingen opslaan</translation>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
-        <translation>Het is niet mogelijk om de projectie in te stellen: gelieve er één te specifiëren</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Geheel getal</translation>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
-        <translation>Informatie</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n kenmerk</numerusform>
-            <numerusform>%n kenmerken</numerusform>
-        </translation>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Lengtegraad</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
-        <translation>Maat</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Breedtegraad</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
-        <translation>Features</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Onjuiste projectie</translation>
     </message>
-</context>
-<context>
-    <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
-        <source>Show All</source>
-        <translation>Toon alles</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Het is niet mogelijk om de projectie in te stellen.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
-        <source>Hide All</source>
-        <translation>Verberg Alle</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Geen coördinaten</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Lagen</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Veld voor breedte- of lengtegraad ontbreekt. Het is onmogelijk om dit bestand te importeren.
+Wenst u echt te stoppen?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Alles</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Laad CSV importeerinstellingen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="402"/>
-        <source>Map</source>
-        <translation>Kaart</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Merkaartor instellingen voor importeren (*.mis)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="403"/>
-        <source>Draw</source>
-        <translation>Teken</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Onjuist bestand</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 kon niet worden geopend</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>Sporen</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>CSV-importeerinstellingen opslaan</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>zonder titel</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Alle bestanden (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 kon niet worden geopend om te schrijven.</translation>
+    </message>
+</context>
+<context>
+    <name>ImportExportGdal</name>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation>Het is niet mogelijk om de projectie in te stellen: gelieve er één te specifiëren</translation>
+    </message>
+</context>
+<context>
+    <name>InfoDock</name>
+    <message>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation>Informatie</translation>
+    </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation>Maat</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
+        <translation>Features</translation>
+    </message>
+</context>
+<context>
+    <name>LayerDock</name>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
+        <source>Show All</source>
+        <translation>Toon alles</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
+        <source>Hide All</source>
+        <translation>Verberg Alle</translation>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="255"/>
@@ -1837,66 +1818,96 @@ p, li { white-space: pre-wrap; }
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Lagen</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Alles</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="402"/>
+        <source>Map</source>
+        <translation>Kaart</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="403"/>
+        <source>Draw</source>
+        <translation>Teken</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>Sporen</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation>Zichtbaar</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation>Alleen-lezen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Laag</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Hoog</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Ondoorzichtig</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Ondoorzichtigheid</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
         <translation>Sluiten laag: er zijn nog gewijzigde objecten aanwezig</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
         <translation>Er zijn gewijzigde kenmerken op deze laag.
 Bent u zeker dat u deze wenst af te sluiten? (Dit kan niet meer ongedaan worden gemaakt)</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
         <translation>Sluiten laag: niet leeg</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
         <translation>Weet u zeker dat u deze laag wenst af te sluiten? (kan niet worden ongedaan gemaakt)</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
 </context>
 <context>
     <name>LicenseDisplayDialog</name>
@@ -1908,7 +1919,7 @@ Bent u zeker dat u deze wenst af te sluiten? (Dit kan niet meer ongedaan worden
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
@@ -1927,2571 +1938,2648 @@ Bent u zeker dat u deze wenst af te sluiten? (Dit kan niet meer ongedaan worden
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Plugins aan het laden...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Initialisatie wordt uitgevoerd...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Maak Tag '%1' voor %2 leeg</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Maak Gebied Interactie</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Help</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Maak Gebied %1</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Maak</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Gebied: maak weg %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Weg</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Gat toevoegen</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Bewerk</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Wil je een (ander) gat in dit gebied maken?</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Scherm</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Gebied: beëindig weg %1</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Bladwijzers</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Gebied: Voeg punt %1 toe aan weg %2</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>&Projectie instellen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>Gebied %1 sluiten</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Bestand</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Knopen toevoegen aan weg %1 met dubbele rijbanen</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Exporteren</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Maak een dubbele-rijbaan Weg %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Open re&cent</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Maak node interactie</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Importeer recen&t</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Maak node in Weg: %1</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>&Gereedschappen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Maak POI (referentiepunt) %1 aan</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Stijl</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>LINKS-KLIKKEN om te starten; SLEPEN om te schalen; SHIFT-SLEPEN om te draaien; LINKS-KLIKKEN om te beëindigen</translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation>Ta&gsjablonen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Maak Polygoon interactie</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>K&nooppunt</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Creëer polygoon %1</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Venster</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Maak rotonde interactie</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Vastmaken</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Maak Rotonde %1</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Fea&ture</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Maak weg interactie</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Maak Node %1 in Weg %2</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Lagen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Maak Weg: %1</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Maak Node: %1</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&atie</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Voeg knoop %1 toe aan weg %2</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>&Toon</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Weg %1 sluiten</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Toon &richtingspijlen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>LINKS-KLIK om te selecteren;RECHTS-KLIK om het hele scherm te verplaatsen;CTRL-LINKS-KLIK om de selectie te wisselen;SHIFT-LINKS-KLIK om elementen toe te voegen aan de selectie;LINKS-SLEPEN om een gebied te selecteren;CTRL-RECHTS-SLEPEN om te zoomen;DUBBELKLIK om een knooppunt aan te maken;DUBBELKLIK op een knooppunt om te starten met het aanmaken van een weg;</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Hoofdgereedschappenbalk</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>KLIK om te selecteren/verplaatsen;CTRL-KLIK om selectie te wisselen;SHIFT-KLIK om aan selectie toe te voegen;SHIFT-SLEEP om een gebied te selecteren;CTRL-SLEEP om in en uit te zoomen;DUBBELKLIK om een knooppunt aan te maken;DUBBELKLIK op een knooppunt om te beginnen met het aanmaken van een weg;</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Afsluiten</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Interactie wijzigen</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&Over</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation>Kenmerken verwijderen</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Openen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>Wenst u de de onderliggende knooppunten ook te verwijderen?
-Houd er rekening mee dat knooppunten buiten het afgehaalde gebied behouden zullen blijven.</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Maak een nieuw document en importeer een bestand</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation>%1 wegen omkeren</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Knooppunten verplaatsen</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Zoom &volledig uit</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Verplaats knooppunt %1</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Knooppunten gevonden op dezelfde positie</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Zoom &venster</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Wil je alle nodes op de doelpositie samenvoegen?</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Zoomvenster</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Nodes samengevoegd in %1</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Verwijder kenmerk %1</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>&Uitzoomen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>LINKS-KLIKKEN om te selecteren; LINKS-SLEPEN om te verplaatsen</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Verplaats node interactie</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>&Inzoomen</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation>Muisaanwijzer eroverheen bewegen om te selecteren; LINKS-SLEPEN om te roteren</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Zoom in</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation>Kenmerk roteren</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Gebogen lijn</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>LINKS-KLIK in de eerste hoek -> LINKS-SLEEP om gebied aan te geven -> LINKS-KLIK om te zoomen</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Ongedaan maken</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>tegel %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Opnieuw</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Eigenschappen ...</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Projectiebestand kan niet worden geladen</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Verplaats</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Laag</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importeer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Hoog</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importeer een bestand in het huidige document</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Ondoorzichtig</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Download</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>Bestand</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Download kaartgegevens voor een nieuw gebied</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Wijzigen</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>Zicht</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Link</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>Toon</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Koppeling maken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Richtingpijlen</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Selecteer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Lagen</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Creëer</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Op de server opslaan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Onderdeel</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Wijzigingen doorsturen naar de server</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Knooppunt</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Weg</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>V&erwijderen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relatie</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Verwijder geselecteerde kenmerken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Gereedschappen</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Wis</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Maak nieuwe weg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Help</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Klembord niet geldig</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Maak nieuwe node</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Klembord bevat geen geldige data.</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Omdraaien</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Niet-opgeslagen wijzigingen</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Weg richting omkeren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>De huidige kaart bevat niet-opgeslagen wijzigingen die verloren zullen gaan als u aan een nieuwe begint.
-Wenst u het aanmaken van een nieuwe kaart te annuleren of wenst u verder te gaan en de gemaakte wijzigingen te verliezen?</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Ga naar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Weg met dubbele rijbanen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Punten op een weg</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Maak dubbele weg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Spoor %1</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Copyright waarschuwing</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Maak Rotonde</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Je probeert een KML bestand te importeren. Let op dat:
-
- - Je geen KML bestand in OSM kan importeren indien gemaakt met Google Earth. Hoewel het voor de hand ligt
-   om te denken dat de nodes die je met GE maakte van jou zijn, zijn ze dat niet!
-   Ze zijn een afgeleid werk van GE en kunnen daarom, als zodanig, niet worden gebruikt in OSM.
-
- - Indien je het bestand downloadde van het internet, bestaat eveneens de kans dat er een copyright op zit.
-   Je moet er absoluut zeker van zijn, dat het gebruik van dit bestand toegestaan is door de maker, of dat de data publiek domein is.
-
-Bij twijfel, raadpleeg de "legal", "talk" (beiden Engels) of "talk-nl" (Nederlands) Openstreetmap mailing lists.
-
-Weet je absoluut zeker dat deze KML legaal geïmporteerd kan worden in OSM?</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Nieuw</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Geen geldig bestand</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Maak een nieuw document</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 kon niet worden geopend</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Opsplitsen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Splits weg in aparte (verbonden) wegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Oude versie van Qt gedetecteerd</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Koppelen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Combineer verbonden wegen tot één enkele weg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Het lijkt erop dat u uw
-OpenStreetMapgebruikersnaam en -wachtwoord nog niet heeft opgegeven.
-Wenst u dit nu te doen?</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Losmaken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Fout tijdens downloaden</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Breken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>De kaart kon niet worden afgehaald</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Breek de verbonden wegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Fout bij het downloaden van OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>De OpenStreetBugs konden niet worden afgehaald</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&latie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Maak Relatie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Gebied</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Polygoon creëren</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Maak nieuw gebied</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Specifieer het aantal kanten</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Bewerk...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Combineer Wegen</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Opslaan &als...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Splits wegen</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Laden...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Wegen splitsen</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Bocht</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Vereenvoudig wegen</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Instellingen...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Forceer Feature Uploaden</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Alle...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Exporteer alle zichtbare lagen naar een bestand</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Kan OpenStreetBugs niet bereiken.</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Vind...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Zoek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Kan fout niet verwijderen. Bericht van de server:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Zoek en selecteer items</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Maak Kruising</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Venster</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Voeg huisnummers toe</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Exporteer de zichtbare onderdelen in het scherm naar een bestand</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>In hoeveel segmenten wenst u dit op te delen?</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Voeg toe...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Verwijder...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>Verdeel weg onder in %1</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>Sa&menvoegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Knooppunten samenvoegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Voeg de geselecteerde nodes samen (eerst geselecteerde blijft bestaan)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>driehoekig</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>rechthoekig</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Opslaan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>vijfhoekig</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Opslaan naar bestand</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>zeshoekig</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>zevenhoekig</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Download meer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>achthoekig</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Download meer kaartgegevens voor het huidige gebied</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>Uitlijnen op %1 assen</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Download het huidige beeld naar de vorige download laag</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Eigenschappen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>Het uitlijnen op de assen is mislukt. Gelieve scherpe hoeken te corrigeren en het opnieuw te proberen.</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Verberg/Toon het Eigenschappen vak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>Het uitlijnen op de assen is mislukt. Geen oplossing gevonden.</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Verberg/Toon het Lagen vak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Knopen uitlijnen</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation>Verspreid knooppunten</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Informatie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Maak Node %1 los</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Verberg/Toon het Informatie vak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Lid toevoegen aan de relatie</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Verwijder onderdeel uit relatie</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Uitlijnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Knopen uitlijnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>Gebieden verbinden</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Knopen uitlijnen. De eerste twee geselecteerde knopen bepalen op welke lijn.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Splits gebied</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>Uit&spreiden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Maak Relatie %1</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation>Verspreid knooppunten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Kaartstijl opslaan</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Knopen uitlijnen en evenredig verdelen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Merkaartor kaartstijl (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Verberg/Toon het Ongedaan maken vak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Laad kaartstijl</translation>
-    </message>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Ondersteunde formaten</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Toon afgehaal&de gebieden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>GPS uitwissel formaat (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>OpenStreetMap formaat (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>Kopieer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>OpenStreetMap wijzigingenformaat (*.osc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Kopieer geselecteerde onderdelen en tags naar het klembord</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Noni GPSPlot formaat (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Kopieer de geselecteerde onderdelen tags naar het klembord; als het onderdeel een routepunt is, kopieer het coördinaat ook.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>NMEA GPS log formaat (*.nmea *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>KML bestand (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Plak Tags (&Overschrijf)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>bestandsformaat met door komma's gescheiden waardes (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Plak (en overschrijf) de tags op het klembord op het geselecteerde onderdeel.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Afbeeldingen met positieinformatie (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>ESPRI Shapebestand (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Plak Tags (&Samenvoegen)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Plak onderdelen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Plak onderdelen van het klembord (Voeg samen met bestaande tags)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Merkaartordocument (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Voeg de tags op het klembord samen met die van het geselecteerde onderdeel.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Weg</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Laad afbeelding</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Geselecteerd...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Plak Kenmerk(en)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Sla geografische coördinaten op in foto</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Plakken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Plak onderdelen van het klembord)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Bewaar de kenmerken in het klembord; Indien de kenmerk ID's al bestaan, overschrijf ze.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Merkaartor kaartstijl (*.mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation>MapCSS stylesheet (*.css)</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binair)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Merkaartordocument opslaan</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Forceer Uploaden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>zonder titel</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Stuur onderdeel naar de wijzigingen laag</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Merkaartor documentbestanden (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Stuur het geselecteerde onderdeel van een niet-uploaden laag (bijv. Route of Uittreksel) naar de wijzigingen laag, klaar om te uploaden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Alle bestanden (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation>Merkaartor sjabloondocument opslaan</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Toon/Verberg de knoppenbalk</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 kon niet worden geopend om te schrijven.</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Verberg Alle</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Onjuist bestand</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Toon alles</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 is geen geldig Merkaartordocument.</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>&Afbeeldingslaag</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Exporteer OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>OSM Bestanden (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Toon k&nooppunten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Exporteer osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>osmChange Files (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Toon na&men</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Exporteer GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPX Bestanden (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Start</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exporteer KML</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Start GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KML Bestanden (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>He&rhalen...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>GPS afspelen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Verberg/Toon het GPS-vak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Bladwijzer toevoegen</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>S&top</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Specifieer de naam van de bladwijzer</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Stop GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Onjuiste bladwijzer naam</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centreer op GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Bladwijzer mag niet blanco zijn</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Toon spoor&segmenten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Waarschuwing: bladwijzernaam bestaat reeds</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Voeg een nieuwe toe, houd de huidige om te overschrijven of annuleer.</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Toon &schaal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Bladwijzer verwijderen</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Selecteer de te verwijderen bladwijzer</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Toon &relaties</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Onjuiste projectie</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Het is niet mogelijk om de projectie "%1" in te stellen.</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Toon wegenachtergrond</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>GPS fout</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Het is niet mogelijk om de GPS-poort te openen.</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Open NMEA log bestand</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Opnemen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Tagsjablonen opslaan</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>GPS opnemen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Merkaartor tag sjablonen (*.mat)</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pauzeer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Open Tag Sjablonen</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Pauzeer GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoafbeelding</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Verberg/Toon het GeoImage vak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Help</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Maak</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Weg</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Snelkoppelingen beheren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Bewerk</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>Sa&menvoegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Scherm</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Opslaan...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Bladwijzers</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Lid toevoegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>&Projectie instellen</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Lid verwijderen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Toon &richtingspijlen</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Nooit</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>Vo&or eenrichtingsstraten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Bestand</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Altijd</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Exporteren</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Losmaken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Open re&cent</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Knoop van een weg ontkoppelen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Importeer recen&t</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Knoop van weg ontkoppelen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>&Gereedschappen</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>Offline &werken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Stijl</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>K&nooppunt</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Stijlen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Venster</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Verberg/Toon het Stijlen vak</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Vastmaken</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Fea&ture</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>Bewerken van &WMS servers</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>Bewerken van &TMS Servers...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Lagen</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Herstel de te negeren dialogenstatus</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>GPS Menu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&atie</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Camera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>&Toon</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Maak &Kruising</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Afsluiten</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Roteren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&Over</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Openen</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Maak een nieuw document en importeer een bestand</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Zoom &volledig uit</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Features</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Voeg huis&nummers toe (Karlsruhe scheme)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Zoom &venster</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Maak onderverdeling</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Zoomvenster</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>&Uitzoomen</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Toon &virtuele nodes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Toon breedte-/lengtegraadrooster</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>&Inzoomen</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Zoom in</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>Bewerken van &Projecties...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>Toon foto's o&p de kaart</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Gebogen lijn</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Ongedaan maken</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Verwijderen forceren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Opnieuw</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>&Vereenvoudig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Verplaats</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Vereenvoudig weg(en)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>Vereenvoudig weg door overbodige kinderknooppunten te verwijderen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importeer</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importeer een bestand in het huidige document</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>Gee&n</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Download</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation>Gebieden verbinden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Download kaartgegevens voor een nieuw gebied</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation>Verbind gebieden met raakvlakken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation>Verbind gebieden met raakvlakken.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Link</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>Gebied op&splitsen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Koppeling maken</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation>Splits gebied tussen twee knooppunten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Selecteer</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>&Terras</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation>Verdeel gebied in woongebiedterrassen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Op de server opslaan</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Wijzigingen doorsturen naar de server</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation>Werkbalkbewerker...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>V&erwijderen</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Verwijder geselecteerde kenmerken</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Wis</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>&Afdrukken...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Maak nieuwe weg</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation>Afdrukvoorbeeld...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Eigenschappen ...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Maak nieuwe node</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation>Accentueer gewij&zigde eigenschappen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Omdraaien</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Weg richting omkeren</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Ga naar...</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Weg met dubbele rijbanen</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Maak dubbele weg</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Maak Rotonde</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation>Selecteer omschakelaar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Nieuw</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation>Selecteer eveneens de kinderobjecten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Maak een nieuw document</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>Schalen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Opsplitsen</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation>Opslaan als Sjabloondocument...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Splits weg in aparte (verbonden) wegen</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Koppelen</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Combineer verbonden wegen tot één enkele weg</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Losmaken</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Breken</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Breek de verbonden wegen</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&latie</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Download ontbrekende relaties</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Maak Relatie</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Gebied</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Maak nieuw gebied</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Maak Tag '%1' voor %2 leeg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Bewerk...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Maak %1 tags leeg op %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Opslaan...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Laden...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Verwijder onderdeel '%1' uit %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Sorteer de leden van relatie %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Bocht</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Relatie Gewijzigd %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Instellingen...</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Maak node interactie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Alle...</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Maak node in Weg: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Exporteer alle zichtbare lagen naar een bestand</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Maak Gebied Interactie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Vind...</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Maak Gebied %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Zoek</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Gebied: maak weg %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Zoek en selecteer items</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Gat toevoegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Venster</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Wil je een (ander) gat in dit gebied maken?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Exporteer de zichtbare onderdelen in het scherm naar een bestand</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Gebied: beëindig weg %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Voeg toe...</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Gebied: Voeg punt %1 toe aan weg %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Verwijder...</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Gebied %1 sluiten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>Sa&menvoegen</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Knooppunten samenvoegen</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Knopen toevoegen aan weg %1 met dubbele rijbanen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Voeg de geselecteerde nodes samen (eerst geselecteerde blijft bestaan)</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Maak een dubbele-rijbaan Weg %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Maak POI (referentiepunt) %1 aan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Opslaan &als...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>LINKS-KLIKKEN om te starten; SLEPEN om te schalen; SHIFT-SLEPEN om te draaien; LINKS-KLIKKEN om te beëindigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Opslaan</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Maak Polygoon interactie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Opslaan naar bestand</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Creëer polygoon %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Maak rotonde interactie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Download meer</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Maak Rotonde %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Download meer kaartgegevens voor het huidige gebied</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Maak weg interactie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Download het huidige beeld naar de vorige download laag</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Maak Node %1 in Weg %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Maak Weg: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Eigenschappen</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Maak Node: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Verberg/Toon het Eigenschappen vak</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Voeg knoop %1 toe aan weg %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Weg %1 sluiten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Verberg/Toon het Lagen vak</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>LINKS-KLIK om te selecteren;RECHTS-KLIK om het hele scherm te verplaatsen;CTRL-LINKS-KLIK om de selectie te wisselen;SHIFT-LINKS-KLIK om elementen toe te voegen aan de selectie;LINKS-SLEPEN om een gebied te selecteren;CTRL-RECHTS-SLEPEN om te zoomen;DUBBELKLIK om een knooppunt aan te maken;DUBBELKLIK op een knooppunt om te starten met het aanmaken van een weg;</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>KLIK om te selecteren/verplaatsen;CTRL-KLIK om selectie te wisselen;SHIFT-KLIK om aan selectie toe te voegen;SHIFT-SLEEP om een gebied te selecteren;CTRL-SLEEP om in en uit te zoomen;DUBBELKLIK om een knooppunt aan te maken;DUBBELKLIK op een knooppunt om te beginnen met het aanmaken van een weg;</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informatie</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Interactie wijzigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Verberg/Toon het Informatie vak</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Verwijder kenmerk %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>Kenmerken verwijderen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Uitlijnen</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Wis Kinderen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Knopen uitlijnen</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>Wenst u de de onderliggende knooppunten ook te verwijderen?
+Houd er rekening mee dat knooppunten buiten het afgehaalde gebied behouden zullen blijven.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Knopen uitlijnen. De eerste twee geselecteerde knopen bepalen op welke lijn.</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>%1 wegen omkeren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>Uit&spreiden</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>LINKS-KLIKKEN om te selecteren; LINKS-SLEPEN om te verplaatsen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation>Verspreid knooppunten</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Verplaats node interactie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Knopen uitlijnen en evenredig verdelen</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Knooppunten verplaatsen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Verberg/Toon het Ongedaan maken vak</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Verplaats knooppunt %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Knooppunten gevonden op dezelfde positie</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Wil je alle nodes op de doelpositie samenvoegen?</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Nodes samengevoegd in %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation>Muisaanwijzer eroverheen bewegen om te selecteren; LINKS-SLEPEN om te roteren</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation>Kenmerk roteren</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation>Muisaanwijzer eroverheen bewegen om te selecteren; LINKS-SLEPEN om te herschalen</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation>Interactie schalen</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation>Kenmerk schalen</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>LINKS-KLIK in de eerste hoek -> LINKS-SLEEP om gebied aan te geven -> LINKS-KLIK om te zoomen</translation>
+    </message>
+    <message>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>GPS uitwissel formaat (*.gpx)
+</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>OpenStreetMap formaat (*.osm)
+</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>OpenStreetMap wijzigingenformaat (*.osc)
+</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Noni GPSPlot formaat (*.ngt)
+</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>NMEA GPS log formaat (*.nmea *.nma)
+</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>KML bestand (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Toon afgehaal&de gebieden</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>bestandsformaat met door komma's gescheiden waardes (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Afbeeldingen met positieinformatie (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>Kopieer</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>ESPRI Shapebestand (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Kopieer geselecteerde onderdelen en tags naar het klembord</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Kopieer de geselecteerde onderdelen tags naar het klembord; als het onderdeel een routepunt is, kopieer het coördinaat ook.</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Ondersteunde formaten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Plak Tags (&Overschrijf)</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Merkaartordocument (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Plak (en overschrijf) de tags op het klembord op het geselecteerde onderdeel.</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Alle bestanden (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>tegel %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Plak Tags (&Samenvoegen)</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Projectiebestand kan niet worden geladen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Plak onderdelen</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Plak onderdelen van het klembord (Voeg samen met bestaande tags)</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Laag</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Voeg de tags op het klembord samen met die van het geselecteerde onderdeel.</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Hoog</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Ondoorzichtig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Geselecteerd...</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Onderdeel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Knooppunt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Weg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relatie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Laad afbeelding</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Sla geografische coördinaten op in foto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>Bestand</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>&Afdrukken...</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Wijzigen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation>Afdrukvoorbeeld...</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation>Accentueer gewij&zigde eigenschappen</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Richtingpijlen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Lagen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Creëer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Weg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Gereedschappen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Help</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Klembord niet geldig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Klembord bevat geen geldige data.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Download ontbrekende relaties</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Niet-opgeslagen wijzigingen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>De huidige kaart bevat niet-opgeslagen wijzigingen die verloren zullen gaan als u aan een nieuwe begint.
+Wenst u het aanmaken van een nieuwe kaart te annuleren of wenst u verder te gaan en de gemaakte wijzigingen te verliezen?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Punten op een weg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation>Selecteer omschakelaar</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Spoor %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation>Selecteer eveneens de kinderobjecten</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Copyright waarschuwing</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>Schalen</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Je probeert een KML bestand te importeren. Let op dat:
+
+ - Je geen KML bestand in OSM kan importeren indien gemaakt met Google Earth. Hoewel het voor de hand ligt
+   om te denken dat de nodes die je met GE maakte van jou zijn, zijn ze dat niet!
+   Ze zijn een afgeleid werk van GE en kunnen daarom, als zodanig, niet worden gebruikt in OSM.
+
+ - Indien je het bestand downloadde van het internet, bestaat eveneens de kans dat er een copyright op zit.
+   Je moet er absoluut zeker van zijn, dat het gebruik van dit bestand toegestaan is door de maker, of dat de data publiek domein is.
+
+Bij twijfel, raadpleeg de "legal", "talk" (beiden Engels) of "talk-nl" (Nederlands) Openstreetmap mailing lists.
+
+Weet je absoluut zeker dat deze KML legaal geïmporteerd kan worden in OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation>Opslaan als Sjabloondocument...</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Geen geldig bestand</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Plakken</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 kon niet worden geopend</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Plak onderdelen van het klembord)</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Bewaar de kenmerken in het klembord; Indien de kenmerk ID's al bestaan, overschrijf ze.</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binair)</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Open bestanden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Forceer Uploaden</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Oude versie van Qt gedetecteerd</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Stuur onderdeel naar de wijzigingen laag</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Stuur het geselecteerde onderdeel van een niet-uploaden laag (bijv. Route of Uittreksel) naar de wijzigingen laag, klaar om te uploaden</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Het lijkt erop dat u uw
+OpenStreetMapgebruikersnaam en -wachtwoord nog niet heeft opgegeven.
+Wenst u dit nu te doen?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Fout tijdens downloaden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>De kaart kon niet worden afgehaald</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Toon/Verberg de knoppenbalk</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Fout bij het downloaden van OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Verberg Alle</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>De OpenStreetBugs konden niet worden afgehaald</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Toon alles</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>&Afbeeldingslaag</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Polygoon creëren</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>Toon k&nooppunten</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Specifieer het aantal kanten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Toon na&men</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Combineer Wegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>Bewerken van &WMS servers</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Splits wegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>Bewerken van &TMS Servers...</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Wegen splitsen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Maak onderverdeling</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Vereenvoudig wegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Forceer Feature Uploaden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>&Vereenvoudig</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Kan OpenStreetBugs niet bereiken.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Vereenvoudig weg(en)</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Vereenvoudig weg door overbodige kinderknooppunten te verwijderen</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Kan fout niet verwijderen. Bericht van de server:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Maak Kruising</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>Gee&n</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Meerdere snijpunten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation>Gebieden verbinden</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Die wegen hebben meerdere intersecties.
+Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispunten kunnen achteraf nog steeds worden verwijderd)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation>Verbind gebieden met raakvlakken</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Voeg huisnummers toe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation>Verbind gebieden met raakvlakken.</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>In hoeveel segmenten wenst u dit op te delen?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>Gebied op&splitsen</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation>Splits gebied tussen twee knooppunten</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>Verdeel weg onder in %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>&Terras</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation>Verdeel gebied in woongebiedterrassen</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>driehoekig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation>Werkbalkbewerker...</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>rechthoekig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>vijfhoekig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation>Ta&gsjablonen</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>zeshoekig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>Hoofdgereedschappenbalk</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>zevenhoekig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>achthoekig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>Uitlijnen op %1 assen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Start</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Start GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>He&rhalen...</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>Het uitlijnen op de assen is mislukt. Gelieve scherpe hoeken te corrigeren en het opnieuw te proberen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>GPS afspelen</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>Het uitlijnen op de assen is mislukt. Geen oplossing gevonden.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Verberg/Toon het GPS-vak</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Knopen uitlijnen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation>Verspreid knooppunten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>S&top</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Maak Node %1 los</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Stop GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Lid toevoegen aan de relatie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centreer op GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Verwijder onderdeel uit relatie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Toon spoor&segmenten</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Gebieden verbinden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Toon &schaal</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Splits gebied</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Toon &relaties</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Maak Relatie %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Kaartstijl opslaan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Toon wegenachtergrond</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Merkaartor kaartstijl (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Laad kaartstijl</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Merkaartor kaartstijl (*.mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Opnemen</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation>MapCSS stylesheet (*.css)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>GPS opnemen</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pauzeer</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Pauzeer GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>zonder titel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eoafbeelding</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Merkaartordocument opslaan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Verberg/Toon het GeoImage vak</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Merkaartor documentbestanden (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation>Merkaartor sjabloondocument opslaan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Snelkoppelingen beheren</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 kon niet worden geopend om te schrijven.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>Sa&menvoegen</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Lid toevoegen</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Onjuist bestand</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Lid verwijderen</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 is geen geldig Merkaartordocument.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nooit</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Exporteer OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>Vo&or eenrichtingsstraten</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>OSM Bestanden (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Altijd</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Exporteer osmChange</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Losmaken</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>osmChange Files (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Knoop van een weg ontkoppelen</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Exporteer GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Knoop van weg ontkoppelen</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPX Bestanden (*.gpx)</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Exporteer KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>Offline &werken</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KML Bestanden (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Stijlen</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Verberg/Toon het Stijlen vak</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Herstel de te negeren dialogenstatus</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Bladwijzer toevoegen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>GPS Menu</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Specifieer de naam van de bladwijzer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Camera</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Onjuiste bladwijzer naam</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Maak &Kruising</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Bladwijzer mag niet blanco zijn</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Roteren</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Waarschuwing: bladwijzernaam bestaat reeds</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Voeg een nieuwe toe, houd de huidige om te overschrijven of annuleer.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Voeg huis&nummers toe (Karlsruhe scheme)</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Bladwijzer verwijderen</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>Toon breedte-/lengtegraadrooster</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Selecteer de te verwijderen bladwijzer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Onjuiste projectie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>Bewerken van &Projecties...</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Het is niet mogelijk om de projectie "%1" in te stellen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>Toon foto's o&p de kaart</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>GPS fout</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Het is niet mogelijk om de GPS-poort te openen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Verwijderen forceren</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Open NMEA log bestand</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Sluiten</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Tagsjablonen opslaan</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Relatie Gewijzigd %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Merkaartor tag sjablonen (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Wis Kinderen.</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Open Tag Sjablonen</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Verwijder onderdeel '%1' uit %2</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Unresolved conflicts</source>
         <translation>Onopgeloste conflicten</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Please resolve existing conflicts first</source>
         <translation>Los eerst bestaande conflicten op</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
         <source>It is strongly recommended to save the changes to your document after an upload.
 Do you want to do this now?</source>
         <translation>Het wordt sterk aangeraden om de wijzigingen van je document op te slaan na het uploaden.
@@ -4501,7 +4589,7 @@ Wil je het nu opslaan?</translation>
         <location filename="../src/common/TagModel.cpp" line="131"/>
         <location filename="../src/common/TagModel.cpp" line="162"/>
         <source>Set Tags on multiple features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="133"/>
@@ -4509,212 +4597,159 @@ Wil je het nu opslaan?</translation>
         <source>Set Tags on %1</source>
         <translation>Stel Tags op %1 in</translation>
     </message>
+</context>
+<context>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Open bestanden</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Meerdere snijpunten</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Die wegen hebben meerdere intersecties.
-Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispunten kunnen achteraf nog steeds worden verwijderd)?</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Plak Kenmerk(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Features</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Toon &virtuele nodes</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Maak %1 tags leeg op %2</translation>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
+        <source><i>V: </i><b>%1</b> </source>
+        <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Sorteer de leden van relatie %1</translation>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
+        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
+        <translation><i>laatste: </i><b>%1</b&gt; door <b>%2</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>laatste: </i><b>%1</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation>Muisaanwijzer eroverheen bewegen om te selecteren; LINKS-SLEPEN om te herschalen</translation>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
+        <source><br/><i>layer: </i><b>%1</b> </source>
+        <translation><br/><i>laag: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation>Interactie schalen</translation>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation>Kenmerk schalen</translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
-        <source><i>V: </i><b>%1</b> </source>
-        <translation><i>V: </i><b>%1</b&gt; </translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>beschrijving</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
-        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>laatste: </i><b>%1</b&gt; door <b>%2</b&gt;</translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>commentaar</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>laatste: </i><b>%1</b&gt;</translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Knooppunt</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
-        <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation><br/><i>laag: </i><b>%1</b&gt; </translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>hoogte</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>snelheid</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>grootte</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>leden</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>Rechtsonder</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Relatie</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Rol</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Lid</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
         <translation>Gesloten weg</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Lengte</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Maat</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>%1 knooppunten</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Weg</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>Gebied</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>hoogte</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>snelheid</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>beschrijving</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Weg</translation>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>commentaar</translation>
+        <location filename="../src/common/MapView.cpp" line="339"/>
+        <source>%1 m/pixel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/MapView.cpp" line="345"/>
+        <source>Align: %1m @ %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Knooppunt</translation>
+        <location filename="../src/common/MapView.cpp" line="351"/>
+        <source>%1ms</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="384"/>
         <source>%1 m</source>
@@ -4726,32 +4761,17 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="339"/>
-        <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="345"/>
-        <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="351"/>
-        <source>%1ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Projectie</translation>
     </message>
@@ -4765,22 +4785,32 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
         <translation>Nieuwe Bladwijzer</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Voorkeuren uploaden mislukt</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Dubbele sleutel</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Meer dan 150 voorkeuren</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
         <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
         <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
@@ -4799,7 +4829,7 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/common/MultiProperties.ui" line="33"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="53"/>
@@ -4809,25 +4839,25 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/common/MultiProperties.ui" line="73"/>
         <source>Selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Klasse</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4838,25 +4868,10 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
         <translation>Fout!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Naam zoek service computer niet gevonden.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Naam zoek service computer weigert verbinding.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Name finder service vereist authenticatie</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Onbekende fout.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4871,14 +4886,9 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
-        <source>Output filename</source>
-        <translation>Uitvoer bestandsnaam</translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation>PDF-bestanden (*.pdf)</translation>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
+        <source>Output filename</source>
+        <translation>Uitvoer bestandsnaam</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
@@ -4889,6 +4899,11 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation>PDF-bestanden (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4920,12 +4935,12 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
         <source>min lat/Lon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="90"/>
         <source>max lat/Lon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
@@ -4950,7 +4965,7 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
@@ -5000,25 +5015,6 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Altijd</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Kleur selecteren</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Kaartstijl bewerker</translation>
@@ -5051,6 +5047,31 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Proportionele dikte</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>Vaste lijnbreedte</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
         <translation>Filter</translation>
@@ -5084,12 +5105,12 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
         <source>Visible up to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
         <source>Visible from scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5099,31 +5120,6 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
         <translation>Teken met kleur</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Proportionele dikte</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>Vaste lijnbreedte</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5143,7 +5139,7 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5153,17 +5149,17 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
         <source>Touchup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="981"/>
@@ -5178,7 +5174,7 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5215,6 +5211,25 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
         <source>Label with background tag</source>
         <translation>Label met achtergrond tag</translation>
     </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Altijd</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Kleur selecteren</translation>
+    </message>
 </context>
 <context>
     <name>PhotoLoadErrorDialog</name>
@@ -5226,18 +5241,18 @@ Wenst u nog steeds een kruispunt voor elk ervan aan te maken (ongewenste kruispu
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
         <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
@@ -5247,7 +5262,7 @@ What do you want to do next?</source>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
         <source>Extract info from barcode (Walking Papers)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
@@ -5263,6 +5278,11 @@ What do you want to do next?</source>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialoog</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5270,198 +5290,33 @@ What do you want to do next?</source>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVG-bestanden (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>untitled</source>
         <translation>zonder titel</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Alle bestanden (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation>Afbeeldingen (*.png, *.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>Engels</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Arabisch</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Tsjechisch</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>Duits</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>Frans</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation>Hongaars</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Italiaans</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation>Pools</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Braziliaans-Portugees</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Russisch</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Eigen stijlen map</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Tagsjabloon</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartor tag sjabloon (*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Kleur selecteren</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Gereedschap bestaat reeds</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Een gereedschap met deze naam bestaat al.
-Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaande dient te worden gewijzigd</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Kan huidige gereedschap niet verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Kan huidige gereedschap "%1"  niet verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Kan de naam van het huidige gereedschap niet wijzigen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Kan huidige gereedschap "%1"'s naam niet wijzigen</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Selecteer uitvoerbaar gereedschap</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation>Selecteer sjabloondocument</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation>Merkaartordocument (*.mdc)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Folder voor logbestanden selecteren</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
-        <source>Preferences</source>
-        <translation>Voorkeuren</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Lokalisatie</translation>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>SVG-bestanden (*.svg)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>U moet het programma herstarten om deze wijzigingen van kracht te laten worden</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>Alle bestanden (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Gebruik taal</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation>Afbeeldingen (*.png, *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Vertaal standaardtags</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
+        <source>Preferences</source>
+        <translation>Voorkeuren</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
@@ -5484,11 +5339,6 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Ondoorzichtigheid laag/hoog</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
         <translation>Interactie met 1 muisknop</translation>
@@ -5499,6 +5349,26 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Maak gebruik van uw eigen Qt-stijl</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation>Laat het aanmaken van knopen/wegen toe in selectiemodus</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Maak gebruik van virtuele knooppunten (hiervoor moet een nieuwe sessie worden gestart)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Relaties selecteerbaar als ze verborgen zijn</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
         <source>Colors</source>
         <translation>Kleuren</translation>
@@ -5530,9 +5400,9 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Stijl overschrijven</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Muisover</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>GPX pad</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5545,79 +5415,64 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Pixels</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Focus</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Relaties</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Kaartstijl</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Huidige stijl</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Gebruik een eenvoudige GPX-spoorweergave</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Stijlen uitschakelen voor GPX lagen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Interface</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Sjabloon</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Muisover</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Ingebouwd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Relaties</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Eigen</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Focus</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Gegevens</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Accentueren</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Wachtwoord:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Lokalisatie</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Documenten</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>U moet het programma herstarten om deze wijzigingen van kracht te laten worden</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation>Laat het aanmaken van knopen/wegen toe in selectiemodus</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Gebruik taal</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Vertaal standaardtags</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
@@ -5627,42 +5482,89 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Kaartstijl</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Eigen stijlen map</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Huidige stijl</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Stijlen uitschakelen voor GPX lagen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Sjabloon</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Tagsjabloon</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Ingebouwd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Eigen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Gegevens</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
@@ -5686,6 +5588,16 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Nominatim (Geo Search)</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Documenten</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
         <source>Autosave documents after upload</source>
         <translation>Document automatisch opslaan na het bewaren op de server</translation>
@@ -5713,12 +5625,12 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5726,6 +5638,32 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>GPS</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>GPS-invoer</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Serieel</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Poort</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Gastheer</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
         <translation>NMEA-log opslaan</translation>
@@ -5751,6 +5689,11 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Maak gebruik van een Proxy</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Wachtwoord:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
         <source>User:</source>
         <translation>Gebruiker:</translation>
@@ -5768,7 +5711,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
@@ -5836,55 +5779,59 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Accentueren</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>Engels</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>GPX pad</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Arabisch</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Gebruik een eenvoudige GPX-spoorweergave</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>GPS-invoer</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Tsjechisch</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Nederlands</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Serieel</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>Duits</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>Frans</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Poort</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation>Hongaars</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Gastheer</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Italiaans</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Maak gebruik van virtuele knooppunten (hiervoor moet een nieuwe sessie worden gestart)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Nederlands</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation>Pools</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
@@ -5892,6 +5839,16 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Portugees</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>Braziliaans-Portugees</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Russisch</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
         <source>Slovak</source>
         <translation>Slovaaks</translation>
@@ -5912,14 +5869,66 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Oekraïens</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Relaties selecteerbaar als ze verborgen zijn</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartor tag sjabloon (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Interface</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Kleur selecteren</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Gereedschap bestaat reeds</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Een gereedschap met deze naam bestaat al.
+Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaande dient te worden gewijzigd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Kan huidige gereedschap niet verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Kan huidige gereedschap "%1"  niet verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Kan de naam van het huidige gereedschap niet wijzigen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Kan huidige gereedschap "%1"'s naam niet wijzigen</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Selecteer uitvoerbaar gereedschap</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation>Selecteer sjabloondocument</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation>Merkaartordocument (*.mdc)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Folder voor logbestanden selecteren</translation>
     </message>
 </context>
 <context>
@@ -5972,7 +5981,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6003,30 +6012,30 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6052,7 +6061,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
         <source>Selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
@@ -6060,6 +6069,11 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Eigenschappen - Meerdere elementen</translation>
     </message>
     <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Eigenschappen - Knooppunt</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
         <translation>Eigenschappen - Weg</translation>
@@ -6095,38 +6109,10 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <source>Select member</source>
         <translation>Selecteer lid</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Eigenschappen - Knooppunt</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Cascade opschonen</translation>
@@ -6152,7 +6138,30 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Verplaats knooppunt %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Importeer osmChange</translation>
     </message>
@@ -6162,31 +6171,31 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Importeer NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importeer NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6202,14 +6211,14 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6239,7 +6248,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6250,12 +6259,12 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>GPS log fout</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Het is niet mogelijk om het volgende GPS-logbestand aan te maken: %1.</translation>
     </message>
@@ -6263,17 +6272,17 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>Niet mogelijk om met %1 te verbinden: %2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>GPS log fout</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Het is niet mogelijk om het volgende GPS-logbestand aan te maken: %1.</translation>
     </message>
@@ -6289,7 +6298,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="22"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="29"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="63"/>
@@ -6359,92 +6368,136 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>Gereedschapsbalken aanpassen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Acties</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation>Werkbalken</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Wijzig naam</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Toepassen</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>Naar boven</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6475,7 +6528,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
@@ -6490,7 +6543,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6513,7 +6566,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="61"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
@@ -6528,7 +6581,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6572,6 +6625,11 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <translation>Naam</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Sleutel</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
         <translation>Bevraging</translation>
@@ -6579,12 +6637,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Sleutel</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6598,12 +6651,12 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
@@ -6694,7 +6747,7 @@ Selecteer een andere naam of druk op de <Uitvoeren> knop wanneer de bestaa
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//NL" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6708,6 +6761,21 @@ p, li { white-space: pre-wrap; }
         <translation>Projectie</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Lat/Lon (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>Nulpunt is linksonderaan</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
         <translation>Tegelgrootte:</translation>
@@ -6733,21 +6801,6 @@ p, li { white-space: pre-wrap; }
         <translation>URL-adres van de licentievoorwaarden:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Lat/Lon (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>Nulpunt is linksonderaan</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
         <translation>Toepassen</translation>
@@ -6763,27 +6816,21 @@ p, li { white-space: pre-wrap; }
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: GetServices</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Adres en pad mogen niet blanco zijn.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Download mislukt: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6913,61 +6960,61 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Extraheer - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation># weggedeeltes</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Totale afstand</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Totale duur</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Extraheer - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Tekenlaag extraheren</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Zoomen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
@@ -6977,7 +7024,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="14"/>
         <source>Trackpoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="34"/>
@@ -7002,7 +7049,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="81"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
@@ -7017,7 +7064,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7035,7 +7082,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="36"/>
         <source>Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="49"/>
@@ -7066,12 +7113,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Zoomen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Leegmaken</translation>
     </message>
@@ -7079,35 +7126,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: GetCapabilities</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adres en pad mogen niet blanco zijn.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Download mislukt: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Fout bij het lezen van eigenschappen.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>WMS-serversinstellingen</translation>
@@ -7147,7 +7165,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//NL" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -7163,7 +7181,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
@@ -7205,5 +7223,34 @@ p, li { white-space: pre-wrap; }
         <source>Remove</source>
         <translation>Verwijderen</translation>
     </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: GetCapabilities</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Adres en pad mogen niet blanco zijn.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Fout bij het lezen van eigenschappen.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Download mislukt: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_pl.ts b/translations/merkaartor_pl.ts
index 4601ea1..98076a0 100644
--- a/translations/merkaartor_pl.ts
+++ b/translations/merkaartor_pl.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,13 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Wersja Merkaartora</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -39,7 +32,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (zbudowane przez <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -52,7 +45,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Wersja PROJ4</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -65,26 +58,26 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Wersja GDAL</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
         <translation>Etykieta tekstowa</translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Prawa autorskie Bart Vanhauwaert, Chris Browet i inni, 2006-2012</translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Ten program jest objęty licencją GNU Public License v2</translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Ten program jest objęty licencją GNU General Public License v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -93,12 +86,12 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Lista zmian</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -106,93 +99,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Skrót klawiszowy</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importuj</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Eksportuj</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Domyślne</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Anuluj</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Edytor skrótów klawiszowych</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Otwórz schemat skrótów klawiszowych</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Schemat skrótów klawiszowych Merkaartora (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Nie można otworzyć pliku</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 nie mógł zostać otwarty.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Zapisz schemat skrótów klawiszowych</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>bez nazwy</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Wszystkie Pliki (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Nie można otworzyć pliku do zapisu</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 nie mógł zostać otwarty do zapisu.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -246,11 +269,7 @@ p, li { white-space: pre-wrap; }
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform>Ruszano <b>%n</b> element</numerusform>
-            <numerusform>Ruszano <b>%n</b> elementy</numerusform>
-            <numerusform>Ruszano <b>%n</b> elementów</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -280,7 +299,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -297,7 +316,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Powiększ</translation>
     </message>
@@ -379,16 +398,6 @@ Server message is '%2'</source>
 Serwer odpowiedział: %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
-        <source>OPEN changeset</source>
-        <translation>OTWÓRZ zestaw zmian</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
-        <source>CLOSE changeset</source>
-        <translation>ZAMKNIJ zestaw zmian</translation>
-    </message>
-    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
         <source>
 API message is '%1'</source>
@@ -400,6 +409,16 @@ Komunikat API "%1"</translation>
         <source>Uploading changes...</source>
         <translation>Wysyłanie zmian...</translation>
     </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
+        <source>OPEN changeset</source>
+        <translation>OTWÓRZ zestaw zmian</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
+        <source>CLOSE changeset</source>
+        <translation>ZAMKNIJ zestaw zmian</translation>
+    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -502,95 +521,95 @@ Proszę ponownie pobrać żeby rozwiązać kolizję.</translation>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>bez nazwy</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Warstwa robocza</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Wysłana warstwa</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Obrazy tła</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation>Warstwa rysunku #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation>Warstwa filtrująca #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>Eksport OSM</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Eksportowanie w formacie OSM…</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Dokument</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
         <translation>Odtwarzanie historii: utwórz węzeł %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
         <translation>Odtwarzanie historii: usuń węzeł %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
         <translation>Odtwarzanie historii: usuń węzeł %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
         <translation>Odtwarzanie historii: utwórz drogę %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
         <translation>Odtwarzanie historii: aktualizuj drogę %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
         <translation>Odtwarzanie historii: usuń drogę %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
         <translation>Odtwarzanie historii: utwórz powiązanie %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
         <translation>Odtwarzanie historii: aktualizuj powiązanie %1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
         <translation>Odtwarzanie historii: usuń powiązanie %1</translation>
     </message>
@@ -646,124 +665,73 @@ Proszę ponownie pobrać żeby rozwiązać kolizję.</translation>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Błąd podczas pobierania</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>błąd</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>Nie pobrano wystarczającej ilości danych</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation>
-            <numerusform>Pobieranie z OSM (%n bajt)</numerusform>
-            <numerusform>Pobieranie z OSM (%n bajty)</numerusform>
-            <numerusform>Pobieranie z OSM (%n bajtów)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation>
-            <numerusform>Pobieranie z OSM (%n kilobajt)</numerusform>
-            <numerusform>Pobieranie z OSM (%n kilobajty)</numerusform>
-            <numerusform>Pobieranie z OSM (%n kilobajtów)</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Pobieranie z OSM (łączenie)</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Nazwa użytkownika lub hasło niepoprawne.</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Nierozwiązane konflikty</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Proszę najpierw rozwiązać wszystkie istniejące kolizje</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Pobieranie punktów trasy %1-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Pobranu trasę - węzły %1-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation>MapDust</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Pobieranie punktów</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
         <source>%1 download</source>
         <translation>Pobranie %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Pobieranie brakujących członków...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
         <source>Downloading unresolved %1 of %2</source>
         <translation>Pobieranie zależności %1 z %2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
         <source>Parsing unresolved %1 of %2</source>
         <translation>Przetwarzanie zależności %1 z %2</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Parsowanie...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
         <translation>Przetwarzanie XML</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
         <translation>Kolizje w %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Wykrytu puste drogi lub relacje</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Puste drogi lub relacje są prawdopodobnie błędami.
+Czy zaznaczyć je do usunięcia?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Usuwa pustą cechę %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
         <translation>Znaleziono kolizje</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
@@ -772,89 +740,127 @@ Cechy te zostały zduplikowane jako "conflict_..." na warstwie "K
 Zanim będzie można wysłać zmiany na serwer, należy ręcznie scalić obie wersje i usunąć je z warstwy "Konflikty...".</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Wykrytu puste drogi lub relacje</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Wysyłanie…</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Puste drogi lub relacje są prawdopodobnie błędami.
-Czy zaznaczyć je do usunięcia?</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Przygotowywanie zmian</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Usuwa pustą cechę %1</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Oczekiwanie na odpowiedź serwera</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Pobieranie %1,%2 (powiększenie %3)...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>błąd</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation><numerusform>Pobieranie z OSM (%n bajt)</numerusform><numerusform>Pobieranie z OSM (%n bajty)</numerusform><numerusform>Pobieranie z OSM (%n bajtów)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation><numerusform>Pobieranie z OSM (%n kilobajt)</numerusform><numerusform>Pobieranie z OSM (%n kilobajty)</numerusform><numerusform>Pobieranie z OSM (%n kilobajtów)</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Pobieranie...</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Pobieranie z OSM (łączenie)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation>Niespodziewany kod zwrotny http (%1)
 Komunikat serwera brzmi: %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 Komunikat API "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Pobieranie...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Błąd podczas pobierania</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Parsowanie...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Nazwa użytkownika lub hasło niepoprawne.</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Pobieranie brakujących członków...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Nierozwiązane konflikty</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Wysyłanie…</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Proszę najpierw rozwiązać wszystkie istniejące kolizje</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Przygotowywanie zmian</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Pobieranie punktów trasy %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Oczekiwanie na odpowiedź serwera</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Pobranu trasę - węzły %1-%2</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation>MapDust</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Pobieranie punktów</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Pobieranie %1,%2 (powiększenie %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Zamknij</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Powiększ</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
@@ -942,6 +948,11 @@ Czy usunąć co się da?</translation>
         <translation>Pobierz brakujących członków</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Dodaj do zaznaczenia</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Usuń</translation>
@@ -966,11 +977,6 @@ Czy usunąć co się da?</translation>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Dodaj do zaznaczenia</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -1021,7 +1027,7 @@ Czy usunąć co się da?</translation>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -1077,271 +1083,245 @@ Czy usunąć co się da?</translation>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Przekroczono limit czasu połączenia</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Nie można wczytać informacji o obrazie z serwera Walking Papers.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Proszę podać adres URL z serwisu Walking Papers</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>Adres URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Geolokalizowane obrazy</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Wyśrodkuj mapę</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
         <translation>c</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Usuń obrazy</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Skopiuj nazwę pliku do schowka</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
-        <source>Load geotagged Images</source>
-        <translation>Wczytaj geolokalizowane obrazy</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Wybierz następny obraz</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
-        <source>Select the layer to which the images belong:</source>
-        <translation>Warstwa, na której powinny się znajdować obrazy:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>PageDown</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation>Warstwa tylko do odczytu</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Wybierz poprzedni obraz</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation>Używana warstwa nie może być zapisana. Czy zmienić ją na zapisywalną?
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>PageUp</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Zapisz geotagowany obraz…</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Warstwa obrazów:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
+        <source>Load geotagged Images</source>
+        <translation>Wczytaj geolokalizowane obrazy</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
+        <source>Select the layer to which the images belong:</source>
+        <translation>Warstwa, na której powinny się znajdować obrazy:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation>Warstwa tylko do odczytu</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation>Używana warstwa nie może być zapisana. Czy zmienić ją na zapisywalną?
 Jeśli nie, to nie można załadować należących do niej obrazów.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Wczytywanie obrazów...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Przerwij wczytywanie</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>Nie ma takiego pliku</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>Nie można znaleźć obrazu %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>Błąd podczas otwierania %2:
+%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Błąd podczas wczytywanie danych EXIF z %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation>Podaj przesunięcie</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation>Ustaw obrazy bliżej:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>końca ścieżki</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>początku ścieżki</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Brak punktów trasy</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Nie znaleziono żadnego punktu trasy dla obrazu %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'sekund'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'minut' i ss 'sekund'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh godzin, mm minut i ss sekund</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>Błędny obraz?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Obraz %1 został wykonany %2 zanim następny punkt trasy został zapisany.
 Czy na pewno go wykorzystać?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Obraz %1 został wykonany %2 po zapisaniu ostatniego punktu trasy.
 Czy na pewno go wykorzystać?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>Nie ma takiego pliku</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Przekroczono limit czasu połączenia</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Nie można wczytać informacji o obrazie z serwera Walking Papers.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Proszę podać adres URL z serwisu Walking Papers</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>Adres URL:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Wyśrodkuj mapę</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Zapisz geotagowany obraz…</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Warstwa obrazów:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>Nie można znaleźć obrazu %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>Błąd podczas otwierania %2:
-%1</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Brak punktów trasy</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Nie znaleziono żadnego punktu trasy dla obrazu %1</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation>Podaj nazwę pliku wyjściowego</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>JPEG Images (*.jpg)</source>
         <translation>Obrazy JPEG (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Błąd podczas wczytywanie danych EXIF z %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation>Podaj nazwę pliku wyjściowego</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Błąd podczas otwierania "%1":
 %2</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Wybierz następny obraz</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>PageDown</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Wybierz poprzedni obraz</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>PageUp</translation>
-    </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Błędny adres OSM</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>Podany adres jest nieprawidłowy!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Błędny format współrzędnych</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Współrzędne muszą być w formacie: <lewa wys.>, <dolna szer.>, <prawa wys.>, <górna szer.></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Współrzędne muszą być w formacie: <środkowa szerokość>, <środkowa wysokość>, <zasięg szerokości>, <zasięg wysokości></translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Idź do</translation>
@@ -1397,51 +1377,77 @@ Czy na pewno go wykorzystać?</translation>
         <source>Search</source>
         <translation>Wyszukaj</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Błędny adres OSM</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>Podany adres jest nieprawidłowy!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Błędny format współrzędnych</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Współrzędne muszą być w formacie: <lewa wys.>, <dolna szer.>, <prawa wys.>, <górna szer.></translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Współrzędne muszą być w formacie: <środkowa szerokość>, <środkowa wysokość>, <zasięg szerokości>, <zasięg wysokości></translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Adapter kształtu</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Powiększ</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
         <translation>Ustaw rzut widoku dla warstwy</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
         <translation>Przywróć dopasowanie ułożenia</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>Adapter WMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>Adapter TMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>Wtyki</translation>
     </message>
@@ -1449,73 +1455,73 @@ Czy na pewno go wykorzystać?</translation>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Brak mapy</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Mapa - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Mapa - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Mapa - WMS-Kafelki - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Mapa - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Mapa - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation>Warunki licencji</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation>Nie zaakceptowano warunków licencyjnych</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
         <translation>Nie potwierdziłeś przyjęcia warunków licencji.
 Nie będziesz więc mógł używać tego źródła jako warstwy mapy.
 Czy jesteś pewny że tego chcesz?</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation>Serwer</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Rozmiar kafla</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation>Min/Maks powiększenia</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Rzut</translation>
     </message>
@@ -1523,158 +1529,59 @@ Czy jesteś pewny że tego chcesz?</translation>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Ciąg znaków</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Okno dialogowe</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Liczba całkowita</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
+        <source>Input</source>
+        <translation>Wejście</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Liczba zmiennoprzecinkowa</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Wysokość geograficzna</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
+        <source>OSM Preview</source>
+        <translation>Podgląd OSM</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Szerokość geograficzna</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
+        <source>Specifications</source>
+        <translation>Specyfikacja</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Nieprawidłowe odwzorowanie</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
+        <source>First line contains headers</source>
+        <translation>Pierwszy wiersz zawiera nagłówek</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Nie można ustawić odwzorowania</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Brak współrzędnych</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Brakuje pól szerokość lub długość geograficzna. Importowanie nie będzie możliwe.
-Zakończyć?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Wczytaj ustawienia importu plików CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Ustawienia importu programu Merkaartor (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Niepoprawny plik</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 nie mógł zostać otwarty.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 nie jest plikiem ustawień importu CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>Zapisz ustawienia importu plików CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>bez nazwy</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Wszystkie Pliki (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>Nie można otworzyć ustawień zapisu importowania</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 nie mógł zostać otwarty do zapisu.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Okno dialogowe</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
-        <source>Input</source>
-        <translation>Wejście</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
-        <source>OSM Preview</source>
-        <translation>Podgląd OSM</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
-        <source>Specifications</source>
-        <translation>Specyfikacja</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
-        <source>First line contains headers</source>
-        <translation>Pierwszy wiersz zawiera nagłówek</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
-        <source>Delimiter</source>
-        <translation>Separator</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
+        <source>Delimiter</source>
+        <translation>Separator</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
@@ -1771,16 +1678,115 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Zapisz ustawienia…</translation>
     </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Ciąg znaków</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Liczba całkowita</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Liczba zmiennoprzecinkowa</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Wysokość geograficzna</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Szerokość geograficzna</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Nieprawidłowe odwzorowanie</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Nie można ustawić odwzorowania</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Brak współrzędnych</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Brakuje pól szerokość lub długość geograficzna. Importowanie nie będzie możliwe.
+Zakończyć?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Wczytaj ustawienia importu plików CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Ustawienia importu programu Merkaartor (*.mis)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Niepoprawny plik</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 nie mógł zostać otwarty.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 nie jest plikiem ustawień importu CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>Zapisz ustawienia importu plików CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>bez nazwy</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Wszystkie Pliki (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>Nie można otworzyć ustawień zapisu importowania</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 nie mógł zostać otwarty do zapisu.</translation>
+    </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
         <translation>Potwierdzić rzut</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
         <translation>Nie można ustawić rzutu; proszę podać jakiś</translation>
     </message>
@@ -1796,22 +1802,18 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n cech</numerusform>
-            <numerusform>%n cechy</numerusform>
-            <numerusform>%n cech</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Cechy</translation>
     </message>
@@ -1819,21 +1821,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Warstwy</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Wszystkie</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>Ścieżki</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
         <source>Show All</source>
@@ -1861,6 +1848,16 @@ p, li { white-space: pre-wrap; }
         <translation>Zamknij</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Warstwy</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Wszystkie</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
         <translation>Mapa</translation>
@@ -1871,6 +1868,11 @@ p, li { white-space: pre-wrap; }
         <translation>Rysuj</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>Ścieżki</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
         <translation>Przywróć domyślne warstwy</translation>
@@ -1879,62 +1881,62 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
-        <source>Visible</source>
-        <translation>Widoczna</translation>
-    </message>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Okno formy</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
+        <source>Visible</source>
+        <translation>Widoczna</translation>
+    </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
+        <source>Readonly</source>
+        <translation>Tylko do odczytu</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Niska</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Wysoka</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Nieprzeźroczysta</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Nieprzeźroczystość</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
         <translation>Zamykanie warsty: zmienione objekt są w niej</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
         <translation>Ruszano cechy na tej wraste.
 Czy napewno ją zamknąć? (Nie ma możliwości cofnięcia)</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
         <translation>Zamykanie warsty: nie jest pusta</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
         <translation>Czy jesteś pewsien że chcesz zamknąć tą warstwę? (Tej operacji nie można cofnąć)</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
-        <source>Readonly</source>
-        <translation>Tylko do odczytu</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Okno formy</translation>
-    </message>
 </context>
 <context>
     <name>LicenseDisplayDialog</name>
@@ -1965,2814 +1967,2806 @@ Czy napewno ją zamknąć? (Nie ma możliwości cofnięcia)</translation>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Ładowanie wtyczek...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="248"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Zaczynanie...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Wyczyść znacznik %1 na %2</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Utwórz obszar %1</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>P&omoc</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Obszar: Stwórz drogę %1</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Utwórz</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Obszar: Zakończ drogę %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Ulice</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Obszar: Dodaj węzeł %1 do drogi %2</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Edycja</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Widok</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Zakładki</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Dodaj węzły do dwujezdniowej drogi %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Ustaw &odwzorowanie</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Utwórz dwujezdiową drogę %1</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Nieprzeźroczystośc obszarów</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Utwórz węzeł na drodze %1</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Plik</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Utwórz miejsce %1</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Eksportuj</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Utwórz rondo %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Os&tatnio otwierane</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Utwórz węzeł %1 na drodze %2</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Ostatnio i&mportowane</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Utwórz drogę: %1</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>&Narzędzia</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Utwórz węzeł: %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Styl</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Dodaj węzeł %1 do drogi %2</translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Zamknąć drogę %1</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Węzły</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Okna</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Panele</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove feature %1</source>
-        <translation>Usuń cechę %1</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>&Cecha</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
-        <source>Remove features</source>
-        <translation>Usuń cechy</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>Czy usunąć również pochodne węzły?
-Węzły OSM poza pobranym obszarem zostaną zachowane.</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Warstwy</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
-        <source>Reverse %1 ways</source>
-        <translation>Odwróć %1 dróg</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>kafel %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&acje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Właściwości...</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>&Pokaż</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>Plik</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Wyświetlanie strz&ałek kierunkowych</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Edycja</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>Widok</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Zamknij</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>Pokaż</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>Informacje &o</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Strzałki kierunkowe</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Otwórz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Utwórz nowy dokument i zaczerpnij plik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Warstwy</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Utwórz</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Pokaż &wszystko</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Cecha</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Węzeł</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Powiększ &okno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Droga</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Powiększa okno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relacja</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Narzędzia</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>&Zmniejsz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation>Okna</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Pomoc</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>&Powiększ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Zawartośc schowka jest niepoprawna</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Powiększ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation>Ustawienie Wycinania</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Schowek nie zawiera poprawnych danych</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Zakrzywiony łącznik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>Unsaved changes</source>
-        <translation>Niezapisane zmiany</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Cofnij</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>Aktualna mapa zawiera niezapisane zmiany, które zostaną utracone podczas tworzenia nowej.
-Anulować tworzenie nowej mapy czy porzucić poprzednie zmiany?</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation>Niezapisany zmiany w stylu</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Przywróć</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation>Dokonano zmian w bierzącym stylu.
-Czy zachować zmiany?</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Punkty pośrednie</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Przesuń</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Ścieżka %1</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Brak poprawnego pliku</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importuj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3350"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 nie mógł zostać otwarty.</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importuje plik do obecnego dokumentu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation>Przychodzące zapytanie zdalnego sterowania</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Pobierz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation>Nieznany url działania: %1</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Pobierz dane dla nowego obszary</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Wykryto nieaktualną wersję Qt</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Używasz Qt w wersji %1, która zawiera różne znane błędy powodujące zwrot kodów 401 podczas wysyłania danych na serwery OpenStreetMap. Czy chcesz kontynować (nie zalecane)? 
-Więcej informacji znajdziesz na stronie http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Łącznik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Wysyłanie do OSM</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Utwórz łącznik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Nie podano nazwy użytkownika i hasła do OpenStreetMap.
-Czy chcesz to zrobić teraz?</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Błąd podczas pobierania</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Zaznacz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Nie można pobrać mapy</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Błąd w trakcie pobieranie z serwera OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Wyślij</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>Nie można pobrać danych zserwisu OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Wyślij zmiany na serwer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation>Błąd pobierania MapDust</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation>Nie można borać błędów z MapDust</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>&Usuń</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Połącz drogi</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Usuń wybrane cechy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Podziel drogi</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Rozdziel drogi</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Utwórz nową drogę</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Upraszcza drogę</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Przekroczono limit czasu połączenia</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Utwórz nowy węzeł</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Nie można połączyć się z serwerem OpenStreetBugs.</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Błąd w czasie zamykania błędu</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>Odw&róć</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Nie można usunąć błędu. Komunikat serwera:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Odwróć kierunek drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Dodaje adresy</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Przejdź do...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>Ilość segmentów na które podzielić</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation>Podaj islość odcinków</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Dwujezdniową drogę</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>Podziel drogę na %1</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Tworzy drogę z dwiema jezdniami</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation>Wyrównywanie osi</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation>Podaj liczbę osi do których mają zostać wyrównane kąty (wsz. 4 dla prostokątu)</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Tworzenie ronda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>trójkątny</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Nowy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>prostokątny</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Tworzenie nowego dokumentu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>pentagonalny</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Podziel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>heksagonalny</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Podziel drogę w osobne, połączone ze sobą drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>heptagonalny</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>oktagonalny</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>P&ołącz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>Wyrównać do %1 osi</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Złącz połączone drogi w jedną</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>Wyrównaj do %1 regularnych osi</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation>Niemożna wyrównać osi</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>Ro&zdziel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>Wyrównywanie do osi nie powiodło się. Proszę usunąć ostre kąty i spróbować ponownie.</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Rozłącz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>Wyrównywanie do osi nie powiodło się i nie znalazło rozwiązania.</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Rozłęcza połączone ze sobą drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation>Zacznij wyciągać</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation>Rozstaw węzły</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&lacja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation>Dodaj do wieloboku</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Tworzenie relacji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>Połącz obszary</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Obszar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Podziel obszar</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Utwórz nowy obszar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation>Podziel zakrez na %1</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Edycja...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Utwórz relację %1</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Zapisz j&ako...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Zapisz styl mapy</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Otwórz...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Styl map Merkaartor (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Zakrzywiona droga</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Otwórz styl mapy</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Konfiguracja...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Obsługiwane formaty</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Wszystko...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Styl mapty Merkaartoa (*.mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Eksportuje wszystkie widoczne warstwy do pliku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation>Arkusz stylu MapCSS (*.css)</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Wyszukaj...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation>Zostanie podjęta próba odtworzenia historii.
-Nie ma gwarancji, i nie da się tego cofnąć.
-Czy jesteś pewny że tego chcesz? </translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Znajdź</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Wyszukaj i zaznacz elementy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Zapisz dokument Merkaartora</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Widok...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3396"/>
-        <location filename="../src/MainWindow.cpp" line="3409"/>
-        <location filename="../src/MainWindow.cpp" line="3438"/>
-        <location filename="../src/MainWindow.cpp" line="3477"/>
-        <location filename="../src/MainWindow.cpp" line="3536"/>
-        <location filename="../src/MainWindow.cpp" line="4278"/>
-        <source>untitled</source>
-        <translation>bez nazwy</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Eksportuje aktualny widok do pliku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Pliki dokumenty Merkaartora (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>Dod&aj...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3409"/>
-        <location filename="../src/MainWindow.cpp" line="3438"/>
-        <location filename="../src/MainWindow.cpp" line="3477"/>
-        <location filename="../src/MainWindow.cpp" line="3536"/>
-        <location filename="../src/MainWindow.cpp" line="4278"/>
-        <source>All Files (*)</source>
-        <translation>Wszystkie Pliki (*)</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Usuń...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>Format GPX (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Scal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>Format OpenStreetMap (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Scala węzły</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>Plik zmian OpenStreetMap (*.osc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Scala zaznaczone węzły (pozostanie ten zaznaczony jako pierwszy)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Format Noni GPSPlot (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>Log NMEA (*nmea *nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Zapisz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>Plik KML (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Zapisz do pliku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Wartości oddzielone przecinkami (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Geolokalizowane obrazy (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Pobierz więcej</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>Plik kszałtów ESRI (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Pobierz więcej danych dla obecnego obszaru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation>Język zaznaczania geograficznego (*.gml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Pobiera zawartość aktualnego widoku do poprzednio pobranej warstwy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation>Postać zero-jedynkowa Protobuf (*.pbf)
-</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Dokument Merkaartora (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Właściwości</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Droga</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Wyświetla/ukrywa panel właściwości</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Wczytaj obraz</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Dodaj pozycję węzła do obrazu</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Wyświetla/ukrywa panel warstw</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Oznacz obraz bieżącą pozycją</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Informacje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Wyświetla/ukrywa panel informacji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>Wyrówn&aj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Wyrównaj węzły</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Niepoprawny plik</translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Wyrównuje zaznaczone węzły. Pierwsze dwa wskazują linię wyrównania.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 nie jest poprawnym dokumentem Merkaartora.</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Eksportuj w formacie OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>&Rozciągnij</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>Pliki OpenStreetMap (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation>Rozstaw węzły</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Eksportuj w formacie osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Wyrówać i rozstawić wybrane węzły równomiernie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>pliki zmian (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Wyświetla/ukrywa panel operacji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Eksportuj GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Pliki GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Wyświetlanie &pobranych obszarów</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exportuj KML</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Plik KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Kopiuj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Skopiuje zaznaczoną cechę i znaczniki do schowka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Kopiuje tagi wybranej cechy do schowka; jeśli cecha jest punktem trasy kopiuje również jej współrzędne.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Dodaj zakładkę</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Wklej etykiety (&nadpisanie)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Podaj nazwę zakładki.</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Wkleja (nadpisując) etykiety w schowku do wybranego elementu.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Niepoprawna nazwa zakładki</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Nazwa zakładki nie może być pusta.</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Wklej etykiety (&scal)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Uwaga! Zakładka o tej samej nazwie już istnieje.</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Wkelj etykiety</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Wprowadź nową nazwę, zostaw obecną by nadpisać zakładkę lub anuluj.</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Wkleja etykiety ze schowka (scala z obecnymi etykietami)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Usuń zakładkę</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Scal etykiety w schowku z etykietami aktualnie wybranej cechy.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Wybierz zakładkę do usunięcia.</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Zaznaczone...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Wyrównaj węzły</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Wklej cechę/cechy</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Scal węzły w %1</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Wklej</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>GPS error</source>
-        <translation>Błąd GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Wkleja cechy ze schowka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4153"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Nie można otworzyć portu GPS.</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>wkleje cechy ze schowka. Jeśli cechy o takich samych identyfikatorach znajdują się już w dokumencie zostaną nadpisane.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4162"/>
-        <source>Open NMEA log file</source>
-        <translation>Otwórz log NMEA</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>P&omoc</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binarny)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Utwórz</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Wymyś wysłanie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Ulice</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Wyślij cechę na warstwę roboczą</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Edycja</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Przesyła wybraną cechę z warstwy, która nie może zostać wysłana do OSM do warstwy roboczej</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Widok</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Zakładki</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Ustaw &odwzorowanie</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Przełącz pasek zadań</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Plik</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Wyświetla/ukrywa pasek zadań</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>&Narzędzia</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Ukryj wszystkie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Styl</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Węzły</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Pokaż wszystkie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Okna</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>Warstwa z &obrazami</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Panele</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>&Cecha</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Wyświetlanie wę&złów</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Warstwy</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Wyświetlanie &nazw</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>&Pokaż</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Zamknij</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Uruchom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>Informacje &o</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Uruchom GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Otwórz</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Odtwórz...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Utwórz nowy dokument i zaczerpnij plik</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Powtórz GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Pokaż &wszystko</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Wyświetla/ukrywa panel GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Powiększ &okno</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>Za&trzymaj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Powiększa okno</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Zatrzymaj GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Wyśrodkuj na GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>&Zmniejsz</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Wyświetlanie &segmentów tras</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>&Powiększ</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Wyświetlanie &skali</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Powiększ</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Wyświetlanie &relacji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Zakrzywiony łącznik</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Cofnij</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Wyświetlanie tła dróg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Wyświetlanie granic dróg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Przywróć</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Pokazuj detale</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Nagraj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Nagrywanie sygnału z GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importuj</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Wstrzymaj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importuje plik do obecnego dokumentu</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Wstrzymaj GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eobraz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Łącznik</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Wyświetla/ukrywa panel obrazów</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Utwórz łącznik</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Menedżer World  OSB...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>Edytor &skrótów klawiszowych...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Scal...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>&Usuń</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Zapisz...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>Dod&aj członka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Usuń członka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Nigdy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>Odw&róć</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>dla &jednokierunkowych dróg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Dwujezdniową drogę</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>Z&awsze</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Nowy</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>O&dłącz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Tworzenie nowego dokumentu</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Oddziel węzeł od drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Podziel</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Odłącz węzeł od drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>Pra&cuj w trybie offline</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>P&ołącz</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Style</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>Ro&zdziel</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Wyświetla/ukrywa panel styli</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&lacja</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>Edytor serwerów &WMS...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Obszar</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>Edytor serwerów &TMS...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Zapisz</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Zresetuj stan przełączalnych okien dialogowych</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>&Rozciągnij</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Menu GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation>Rozstaw węzły</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Aparat cyfrowy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Wyrówać i rozstawić wybrane węzły równomiernie</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Utwórz &skrzyżowanie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>Wyświetlanie wę&złów</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Wyświetlanie &nazw</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>Edytor serwerów &WMS...</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Obróć</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>Edytor serwerów &TMS...</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
+        <location filename="../src/MainWindow.ui" line="1549"/>
         <source>&Polygon</source>
         <translation>&Wielobok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
+        <location filename="../src/MainWindow.ui" line="1554"/>
         <source>Rectangular &building</source>
         <translation>Prostokątny &budynek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
+        <location filename="../src/MainWindow.ui" line="1559"/>
         <source>Add new &Image layer</source>
         <translation>Dodać nową warstwę &obrazu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Cechy</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1572"/>
         <source>Add street &numbers (Karlsruhe scheme)</source>
         <translation>Dodaj &adres (schemat Karlsruhe)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
+        <location filename="../src/MainWindow.ui" line="1581"/>
         <source>&Subdivide</source>
         <translation>&Rozdzielić</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
+        <location filename="../src/MainWindow.ui" line="1584"/>
         <source>Subdivide segment equally</source>
         <translation>Podziel segment równomiernie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
+        <location filename="../src/MainWindow.ui" line="1587"/>
         <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
         <translation>Podziel na kawałki wybrany odcinek drogi (drogę i dwa pobliskie węzły) na odcinki równej długości.)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Wyświetlaj &wirtualne węzły</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1603"/>
         <source>Show lat/lon &grid</source>
         <translation>Wyświ&etlanie siatki współrzędnych</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
+        <location filename="../src/MainWindow.ui" line="1611"/>
         <source>&Lock zoom to tiled background</source>
         <translation>&Zablokuj powiększenie do wielkości kafelków</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
+        <location filename="../src/MainWindow.ui" line="1616"/>
         <source>&Projections Editor...</source>
         <translation>Edytor &odzworowań…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
+        <location filename="../src/MainWindow.ui" line="1624"/>
         <source>Show &Photos on map</source>
         <translation>Wyświetlanie &zdjęć na mapie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
+        <location filename="../src/MainWindow.ui" line="1629"/>
         <source>OsmChange (OSC)</source>
         <translation>ZmianaOSM (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
+        <location filename="../src/MainWindow.ui" line="1634"/>
         <source>Force Delete</source>
         <translation>Wymuś usunięcie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation>Dodać warstwę OpenStreet&Bugs</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1644"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
+        <location filename="../src/MainWindow.ui" line="1649"/>
         <source>S&implify</source>
         <translation>Up&rość</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
+        <location filename="../src/MainWindow.ui" line="1652"/>
         <source>Simplify road(s)</source>
         <translation>Upraszcza drogę</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
+        <location filename="../src/MainWindow.ui" line="1655"/>
         <source>Simplify way by removing unnecessary child nodes</source>
         <translation>Upraszcze drogi poprzez usunięcie zbędnych węzłów</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
+        <location filename="../src/MainWindow.ui" line="1660"/>
         <source>&Filters Editor...</source>
         <translation>Edytor &filtrów</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
+        <location filename="../src/MainWindow.ui" line="1668"/>
         <source>&None</source>
         <translation>Ż&aden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
+        <location filename="../src/MainWindow.ui" line="1677"/>
         <source>&Join Areas</source>
         <translation>&Połącz obszary</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
+        <location filename="../src/MainWindow.ui" line="1680"/>
         <source>Join touching areas</source>
         <translation>Połącz stykające się obszary</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
+        <location filename="../src/MainWindow.ui" line="1683"/>
         <source>Join areas which are touching.</source>
         <translation>Połącz stykające się obszary.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
+        <location filename="../src/MainWindow.ui" line="1692"/>
         <source>&Split Area</source>
         <translation>&Podziel obszar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
+        <location filename="../src/MainWindow.ui" line="1695"/>
         <source>Split area between two nodes</source>
         <translation>Podziel obszar międzt dwoma węzłami</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
+        <location filename="../src/MainWindow.ui" line="1698"/>
         <source>Split a selected area between two selected nodes into two separate areas.</source>
         <translation>Podziel wybrany obszar między dwoma wybranymi węzłami na dwa oddzielne obszary.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
+        <location filename="../src/MainWindow.ui" line="1707"/>
         <source>&Terrace</source>
         <translation>&Drabina</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
+        <location filename="../src/MainWindow.ui" line="1710"/>
         <source>Terrace area into residences</source>
         <translation>Podziel zakres na mieszkania</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
+        <location filename="../src/MainWindow.ui" line="1713"/>
         <source>Split a selected area into terraced residences.</source>
         <translation>Podziel wybrany obszar na drabinkę mieszkań.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
+        <location filename="../src/MainWindow.ui" line="1718"/>
         <source>Toolbar Editor...</source>
         <translation>Edytor paska narzędzi...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
+        <location filename="../src/MainWindow.ui" line="1727"/>
         <source>A&xis Align</source>
         <translation>Wyrówanie &osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
+        <location filename="../src/MainWindow.ui" line="1730"/>
         <source>Align edges to regular axes</source>
         <translation>Wyrównaj kąty do regularnych osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
+        <location filename="../src/MainWindow.ui" line="1733"/>
         <source>Align edges to a certain number of regularly spaced axes.</source>
         <translation>Wyrównaj kąty do pewne ilości równomiernie rozstawionych osi.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
+        <location filename="../src/MainWindow.ui" line="1738"/>
         <source>&Print...</source>
         <translation>&Drukuj...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
+        <location filename="../src/MainWindow.ui" line="1743"/>
         <source>Print preview...</source>
         <translation>Podgląd druku...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Właściwości...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1756"/>
         <source>Highlight dirt&y features</source>
         <translation>Podświetlaj rzecz&y ruszane</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation>Dodać nową warstwę &rysunku</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1770"/>
         <source>Cu&t</source>
         <translation>&Wytnij</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
+        <location filename="../src/MainWindow.ui" line="1773"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation>Dodać nową warstwę &filtrów</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1786"/>
         <source>E&xtrude</source>
         <translation>Wyczerpnij</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
+        <location filename="../src/MainWindow.ui" line="1789"/>
         <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
+        <location filename="../src/MainWindow.ui" line="1792"/>
         <source>Alt+X</source>
         <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
+        <location filename="../src/MainWindow.ui" line="1797"/>
         <source>Select toggle</source>
         <translation>Przełącz wybranie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
+        <location filename="../src/MainWindow.ui" line="1802"/>
         <source>Include children in selection</source>
         <translation>Włącz pochodne do wyboru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
+        <location filename="../src/MainWindow.ui" line="1814"/>
         <source>Scale</source>
         <translation>Skala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
+        <location filename="../src/MainWindow.ui" line="1819"/>
         <source>Save as Template Document...</source>
         <translation>Zachowaj jako Szablon Dokumentu...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Zakrzywiona droga</translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation>Utwórz wielobok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation>Dodaj do w&ieloboku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Konfiguracja...</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation>Wykrywać dróg Bing</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Wszystko...</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation>Odtwó&rz historię</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Eksportuje wszystkie widoczne warstwy do pliku</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation>Dodać warstwę Map&Dust</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Wyszukaj...</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation>Siatka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Wyszukaj i zaznacz elementy</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation>Ctrl+Alt+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Widok...</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation>Wybierz nadrzędne</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Eksportuje aktualny widok do pliku</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Pobierz brakujących członków</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>Dod&aj...</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Usuń...</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Scal</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Wyczyść znacznik %1 na %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Scala zaznaczone węzły (pozostanie ten zaznaczony jako pierwszy)</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Wyczyść %1 etykiet na %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Zapisz j&ako...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Usuń członka %1 z %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Zmień kolejność członków relacji %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Pobierz więcej</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Zmodyfikuj relację %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Pobiera zawartość aktualnego widoku do poprzednio pobranej warstwy</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Tworzenie węzła</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Utwórz węzeł na drodze %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Wyświetla/ukrywa panel właściwości</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Utwórz interakcję powierzchni</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Utwórz obszar %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Wyświetla/ukrywa panel warstw</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Obszar: Stwórz drogę %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Dodaj dziurę.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Wyświetla/ukrywa panel informacji</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Utworzyć nową dziurę w tym obszarze?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Obszar: Zakończ drogę %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>Wyrówn&aj</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Obszar: Dodaj węzeł %1 do drogi %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Wyrównuje zaznaczone węzły. Pierwsze dwa wskazują linię wyrównania.</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Wyświetla/ukrywa panel operacji</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Dodaj węzły do dwujezdniowej drogi %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Utwórz dwujezdiową drogę %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Wyświetlanie &pobranych obszarów</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Utwórz miejsce %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>Kliknij, aby rozpocząć; przeciągnij, aby przeskalować; przeciągnij z wciśniętym klawiszem SHIFT, aby obrócić; kliknij, aby zakończyć</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Kopiuje tagi wybranej cechy do schowka; jeśli cecha jest punktem trasy kopiuje również jej współrzędne.</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Tworzenie wielokątu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Utwórz wielokąt %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Wkleja (nadpisując) etykiety w schowku do wybranego elementu.</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Tworzenie ronda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Utwórz rondo %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Scal etykiety w schowku z etykietami aktualnie wybranej cechy.</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Tworzenie drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Utwórz węzeł %1 na drodze %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Zaznaczone...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Utwórz drogę: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>wkleje cechy ze schowka. Jeśli cechy o takich samych identyfikatorach znajdują się już w dokumencie zostaną nadpisane.</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Utwórz węzeł: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Dodaj węzeł %1 do drogi %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Zamknąć drogę %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binarny)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Przesyła wybraną cechę z warstwy, która nie może zostać wysłana do OSM do warstwy roboczej</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Działania</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Usuń cechę %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Przełącz pasek zadań</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>Usuń cechy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Wyświetla/ukrywa pasek zadań</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Usuń potomków.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Ukryj wszystkie</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>Czy usunąć również pochodne węzły?
+Węzły OSM poza pobranym obszarem zostaną zachowane.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>Odwróć %1 dróg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Pokaż wszystkie</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>Warstwa z &obrazami</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>Kliknij aby zaznaczyć; przeciągnij, aby przesunąć</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Interakcja przesuwania węzła</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Przesuń węzły</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Uruchom</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Przesuń węzeł %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Odtwórz...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Znaleziono węzły o tych samych współrzędnych.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Wyświetla/ukrywa panel GPS</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Czy na pewno scalić wszystkie węzły w miejscu docelowym?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation>Dodać warstwę OpenStreet&Bugs</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Scal węzły w %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation>Dodać nową warstwę &rysunku</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation>ZAWIS zaznacza;LEWY-CIĄGNIE obraca</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation>Dodać nową warstwę &filtrów</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Interakcja obrotu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation>Utwórz wielobok</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation>Obróć cechę</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation>Dodaj do w&ieloboku</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation>GDAL</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation>Wykrywać dróg Bing</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation>Odtwó&rz historię</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>Kliknij, aby wyznaczyć pierwszy róg -> Przeciągnij, aby zaznaczyć obszar -> Kliknij, aby powiększyć</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation>Dodać warstwę Map&Dust</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Interakcja powiększenia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation>Siatka</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>Format GPX (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation>Ctrl+Alt+W</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>Format OpenStreetMap (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation>Wybierz nadrzędne</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>Plik zmian OpenStreetMap (*.osc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Pobierz brakujących członków</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Format Noni GPSPlot (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>Log NMEA (*nmea *nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>Za&trzymaj</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>Plik KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Wyśrodkuj na GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Wartości oddzielone przecinkami (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Wyświetlanie &segmentów tras</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Geolokalizowane obrazy (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>Plik kszałtów ESRI (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Wyświetlanie &skali</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation>Język zaznaczania geograficznego (*.gml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation>Postać zero-jedynkowa Protobuf (*.pbf)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Wyświetlanie &relacji</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Obsługiwane formaty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Dokument Merkaartora (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Wyświetlanie tła dróg</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Wszystkie Pliki (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Wyświetlanie granic dróg</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>kafel %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Pokazuj detale</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Nie można wczytać pliku z odzworowaniem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Nagraj</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>Plik "Projections.xml" nie mógł zostać otwarty. Przerywanie...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Wstrzymaj</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Niska</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Wyświetla/ukrywa panel obrazów</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Wysoka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Nieprzeźroczysta</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Zmodyfikuj relację %1</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Cecha</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4444"/>
-        <source>Unresolved conflicts</source>
-        <translation>Nierozwiązane konflikty</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Węzeł</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4444"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Proszę najpierw rozwiązać wszystkie istniejące kolizje</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Droga</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4468"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Zaleca się zapisanie zmian w dokumencie po ich wysłaniu.
-Czy zrobić to teraz?</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relacja</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Ustaw znaczniki na %1</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Wczytaj obraz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Ważne ostrzeżenie o prawach autorskich</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Dodaj pozycję węzła do obrazu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Podjęto próbę importu pliku KML. Należy być świadomym tego, że:
-
-- nie wolno importować do OpenStreetMap plików KML utworzonych w Google Earth. Mogłoby się wydawać, iż węzły utworzone w Google Earth są wyłącznym tworem użytkownika, jednakże w rzeczywistością stanowią tzw. utwór zależny od Google Earth i jako taki nie można ich wykorzystać w OSM.
-
-- jeśli pobrano plik z Internetu, istnieje możliwość, że są objęte prawem autorskim. Proszę się w pełni upewnić, że użycie tych danych w projekcie OpenStreetMap jest dozwolone przez autora albo dane te w domenie publicznej.
-
-W razie wszelkich wątpliwości, proszę skontaktować się z listą dyskusyjną "legal" lub "talk".
-
-Na pewno można legalnie zaimportować ten plik do OSM?</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Oznacz obraz bieżącą pozycją</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Nie można otworzyć pliku do zapisu</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 nie mógł zostać otwarty do zapisu.</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>Plik</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Pobierz</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Edycja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Wyślij</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Przejdź do...</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Pokaż</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Tworzy drogę z dwiema jezdniami</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Strzałki kierunkowe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Tworzenie ronda</translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Tworzenie relacji</translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Warstwy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Znajdź</translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Utwórz</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Scala węzły</translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Droga</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Wyślij cechę na warstwę roboczą</translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Narzędzia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Uruchom GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation>Okna</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Powtórz GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation>Ustawienie Wycinania</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Zatrzymaj GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Zawartośc schowka jest niepoprawna</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Nagrywanie sygnału z GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Schowek nie zawiera poprawnych danych</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Wstrzymaj GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Menedżer World  OSB...</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Niezapisane zmiany</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>Edytor &skrótów klawiszowych...</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>Aktualna mapa zawiera niezapisane zmiany, które zostaną utracone podczas tworzenia nowej.
+Anulować tworzenie nowej mapy czy porzucić poprzednie zmiany?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4278"/>
-        <source>Save Tag Templates</source>
-        <translation>Zapisz szablon etykiet</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation>Niezapisany zmiany w stylu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4278"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Szablony etykiet Merkaartora (*.mat)</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation>Dokonano zmian w bierzącym stylu.
+Czy zachować zmiany?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4297"/>
-        <location filename="../src/MainWindow.cpp" line="4311"/>
-        <source>Open Tag Templates</source>
-        <translation>Otwórz szablon etykiet</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Punkty pośrednie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Edycja...</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Ścieżka %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Zapisz...</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Ważne ostrzeżenie o prawach autorskich</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Otwórz...</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Podjęto próbę importu pliku KML. Należy być świadomym tego, że:
+
+- nie wolno importować do OpenStreetMap plików KML utworzonych w Google Earth. Mogłoby się wydawać, iż węzły utworzone w Google Earth są wyłącznym tworem użytkownika, jednakże w rzeczywistością stanowią tzw. utwór zależny od Google Earth i jako taki nie można ich wykorzystać w OSM.
+
+- jeśli pobrano plik z Internetu, istnieje możliwość, że są objęte prawem autorskim. Proszę się w pełni upewnić, że użycie tych danych w projekcie OpenStreetMap jest dozwolone przez autora albo dane te w domenie publicznej.
+
+W razie wszelkich wątpliwości, proszę skontaktować się z listą dyskusyjną "legal" lub "talk".
+
+Na pewno można legalnie zaimportować ten plik do OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Scal...</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Brak poprawnego pliku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Dodaj członka do relacji</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 nie mógł zostać otwarty.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Usuń członka z relacji</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Wyświetlanie strz&ałek kierunkowych</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation>Przychodzące zapytanie zdalnego sterowania</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&acje</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation>Nieznany url działania: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>Dod&aj członka</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Otwórz pliki</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Usuń członka</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Wykryto nieaktualną wersję Qt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nigdy</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Używasz Qt w wersji %1, która zawiera różne znane błędy powodujące zwrot kodów 401 podczas wysyłania danych na serwery OpenStreetMap. Czy chcesz kontynować (nie zalecane)? 
+Więcej informacji znajdziesz na stronie http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>dla &jednokierunkowych dróg</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Wysyłanie do OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>Z&awsze</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Nie podano nazwy użytkownika i hasła do OpenStreetMap.
+Czy chcesz to zrobić teraz?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Niska</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Błąd podczas pobierania</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Wysoka</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Nie można pobrać mapy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Nieprzeźroczysta</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Błąd w trakcie pobieranie z serwera OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Nieprzeźroczystośc obszarów</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>Nie można pobrać danych zserwisu OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Eksportuj</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation>Błąd pobierania MapDust</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Os&tatnio otwierane</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation>Nie można borać błędów z MapDust</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Ostatnio i&mportowane</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Utwórz wielokąt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Przesuń</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Podaj ilość boków</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Zaznacz</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Połącz drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopiuj</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Podziel drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Wklej etykiety (&nadpisanie)</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Rozdziel drogi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Wklej etykiety (&scal)</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Upraszcza drogę</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Odłącz węzeł %1</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Wymusza wysłanie cechy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>O&dłącz</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Przekroczono limit czasu połączenia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Odłącz węzeł od drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Nie można połączyć się z serwerem OpenStreetBugs.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Znaleziono węzły o tych samych współrzędnych.</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Błąd w czasie zamykania błędu</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Czy na pewno scalić wszystkie węzły w miejscu docelowym?</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Nie można usunąć błędu. Komunikat serwera:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>Pra&cuj w trybie offline</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Tworzy skrzyżowanie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Pobierz dane dla nowego obszary</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Rozbudowane skrzyżowanie.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Wyślij zmiany na serwer</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Te drogi mają wiele przecięć.
+Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania można zawsze później usunąć ręcznie).</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Dodaje adresy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Usuń wybrane cechy</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>Ilość segmentów na które podzielić</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Utwórz nową drogę</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation>Podaj islość odcinków</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Utwórz nowy węzeł</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>Podziel drogę na %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Odwróć kierunek drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation>Wyrównywanie osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Podziel drogę w osobne, połączone ze sobą drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation>Podaj liczbę osi do których mają zostać wyrównane kąty (wsz. 4 dla prostokątu)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Złącz połączone drogi w jedną</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>trójkątny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Rozłącz</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>prostokątny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Rozłęcza połączone ze sobą drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>pentagonalny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Utwórz nowy obszar</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>heksagonalny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Zapisz do pliku</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>heptagonalny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Pobierz więcej danych dla obecnego obszaru</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>oktagonalny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Wyrównaj węzły</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>Wyrównać do %1 osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Skopiuje zaznaczoną cechę i znaczniki do schowka</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>Wyrównaj do %1 regularnych osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Wkelj etykiety</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation>Niemożna wyrównać osi</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Wkleja etykiety ze schowka (scala z obecnymi etykietami)</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>Wyrównywanie do osi nie powiodło się. Proszę usunąć ostre kąty i spróbować ponownie.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Wklej</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>Wyrównywanie do osi nie powiodło się i nie znalazło rozwiązania.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Wkleja cechy ze schowka</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation>Zacznij wyciągać</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Oddziel węzeł od drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Wyrównaj węzły</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation>Rozstaw węzły</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Usuń członka %1 z %2</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Odłącz węzeł %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Właściwości</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Dodaj członka do relacji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informacje</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Usuń członka z relacji</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation>Dodaj do wieloboku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eobraz</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Połącz obszary</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Style</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Podziel obszar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Wyświetla/ukrywa panel styli</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation>Podziel zakrez na %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3850"/>
-        <source>%1 (int)</source>
-        <translation>%1 (wb.)</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Utwórz relację %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Dodaj dziurę.</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Zapisz styl mapy</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Utworzyć nową dziurę w tym obszarze?</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Styl map Merkaartor (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Nie można wczytać pliku z odzworowaniem</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Otwórz styl mapy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>Plik "Projections.xml" nie mógł zostać otwarty. Przerywanie...</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Styl mapty Merkaartoa (*.mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Otwórz pliki</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation>Arkusz stylu MapCSS (*.css)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Tworzy skrzyżowanie</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4011"/>
-        <location filename="../src/MainWindow.cpp" line="4020"/>
-        <source>Invalid projection</source>
-        <translation>Nieprawidłowe odwzorowanie</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation>Zostanie podjęta próba odtworzenia historii.
+Nie ma gwarancji, i nie da się tego cofnąć.
+Czy jesteś pewny że tego chcesz? </translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4011"/>
-        <location filename="../src/MainWindow.cpp" line="4020"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Nie można ustawić odzworowania "%1".</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>bez nazwy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Zapisz dokument Merkaartora</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Zresetuj stan przełączalnych okien dialogowych</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Pliki dokumenty Merkaartora (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Menu GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Aparat cyfrowy</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Nie można otworzyć pliku do zapisu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Utwórz &skrzyżowanie</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 nie mógł zostać otwarty do zapisu.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
-        <source>Delete Children.</source>
-        <translation>Usuń potomków.</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Ustaw etykiety na wielu cechach</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Niepoprawny plik</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Utwórz interakcję powierzchni</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 nie jest poprawnym dokumentem Merkaartora.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Tworzenie węzła</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Eksportuj w formacie OSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>Kliknij, aby rozpocząć; przeciągnij, aby przeskalować; przeciągnij z wciśniętym klawiszem SHIFT, aby obrócić; kliknij, aby zakończyć</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>Pliki OpenStreetMap (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Tworzenie wielokątu</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Eksportuj w formacie osmChange</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Utwórz wielokąt %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>pliki zmian (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Tworzenie ronda</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Eksportuj GPX</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Tworzenie drogi</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Pliki GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Działania</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Exportuj KML</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Przesuń węzły</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Plik KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Przesuń węzeł %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>Kliknij aby zaznaczyć; przeciągnij, aby przesunąć</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Interakcja przesuwania węzła</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation>ZAWIS zaznacza;LEWY-CIĄGNIE obraca</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (wb.)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Interakcja obrotu</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Dodaj zakładkę</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation>Obróć cechę</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Podaj nazwę zakładki.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>Kliknij, aby wyznaczyć pierwszy róg -> Przeciągnij, aby zaznaczyć obszar -> Kliknij, aby powiększyć</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Niepoprawna nazwa zakładki</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Interakcja powiększenia</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Nazwa zakładki nie może być pusta.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Utwórz wielokąt</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Uwaga! Zakładka o tej samej nazwie już istnieje.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Podaj ilość boków</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Wprowadź nową nazwę, zostaw obecną by nadpisać zakładkę lub anuluj.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Wymusza wysłanie cechy</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Usuń zakładkę</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Wymyś wysłanie</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Wybierz zakładkę do usunięcia.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Obróć</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Nieprawidłowe odwzorowanie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Nie można ustawić odzworowania "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Rozbudowane skrzyżowanie.</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>Błąd GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Te drogi mają wiele przecięć.
-Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania można zawsze później usunąć ręcznie).</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Nie można otworzyć portu GPS.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Wklej cechę/cechy</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Otwórz log NMEA</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Cechy</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Zapisz szablon etykiet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Wyświetlaj &wirtualne węzły</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Szablony etykiet Merkaartora (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Wyczyść %1 etykiet na %2</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Otwórz szablon etykiet</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Zmień kolejność członków relacji %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Nierozwiązane konflikty</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Proszę najpierw rozwiązać wszystkie istniejące kolizje</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Zaleca się zapisanie zmian w dokumencie po ich wysłaniu.
+Czy zrobić to teraz?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Ustaw etykiety na wielu cechach</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Ustaw znaczniki na %1</translation>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>edytowane: </i><b>%1</b> przez <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation><i>edytowane: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
         <translation><br/><i>warstwa: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Punkt trasy</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>współrzędne</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>opis</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>komentarz</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Węzeł</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>wzniesienie</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>prędkość</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>rozmiar</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>członkowie</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>Górny lewy róg</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>Dolny prawy róg</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Relacja</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Funckja</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Członek</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Długość</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>%1 wezłów</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Droga</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>Obszar</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>współrzędne</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>wzniesienie</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>prędkość</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Punkt trasy</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>opis</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>komentarz</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Węzeł</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Droga</translation>
     </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
         <translation>%1 m/plamkę</translation>
@@ -4788,17 +4782,27 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>%1ms</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
         <translation>Ramka</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Rzut</translation>
     </message>
@@ -4806,34 +4810,44 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Nowy serwer</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Nowa zakładka</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Wysyłanie ustawień zakończone niepowodzeniem</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Duplikat klucza</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Więcej niż 150 ustawień</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Nowa zakładka</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Nowy serwer</translation>
     </message>
 </context>
 <context>
@@ -4862,17 +4876,17 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Nieznane pole</translation>
     </message>
@@ -4885,25 +4899,10 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>Błąd!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Nie znaleziono serwera serwisu wyszukiwania nazw.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Serwis wyszukiwania nazw odmówił połączenia.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Serwis wyszukiwania nazw wymaga logowania.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Nieznany błąd.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4924,11 +4923,6 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation>Pliki PDF (*.pdf)</translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4936,6 +4930,11 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation>Pliki PDF (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -5038,52 +5037,29 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <source>User:</source>
         <translation>Użytkownik:</translation>
     </message>
-    <message>
-        <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
-        <source>Pwd:</source>
-        <translation>Pwd</translation>
-    </message>
-</context>
-<context>
-    <name>PaintStyleEditor</name>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Zawsze</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Wybór koloru</translation>
+    <message>
+        <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
+        <source>Pwd:</source>
+        <translation>Pwd</translation>
     </message>
+</context>
+<context>
+    <name>PaintStyleEditor</name>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Edytor stylu mapy</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
-        <source>Add</source>
-        <translation>Dodaj</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
-        <source>Remove</source>
-        <translation>Usuń</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
+        <source>Global</source>
+        <translation>Główne</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
-        <source>Duplicate</source>
-        <translation>Powiel</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
+        <source>Background</source>
+        <translation>Tło</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
@@ -5102,6 +5078,51 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation>Węzły</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Proporcjonalna grubość</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>Stała grubość</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
+        <source>Filter</source>
+        <translation>Filtr</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
+        <source>Add</source>
+        <translation>Dodaj</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
+        <source>Remove</source>
+        <translation>Usuń</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
+        <source>Duplicate</source>
+        <translation>Powiel</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
         <source>Tag selection</source>
         <translation>Wybrana etykieta</translation>
@@ -5123,17 +5144,6 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>Widoczne od skali</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
-        <source>Background</source>
-        <translation>Tło</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
-        <source>Filter</source>
-        <translation>Filtr</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="775"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1347"/>
@@ -5141,31 +5151,6 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>Rysuj na kolorowo</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Proporcjonalna grubość</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation>Węzły</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>Stała grubość</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5238,6 +5223,16 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>Treść etykiety</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
+        <source>Halo</source>
+        <translation>Halo</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
+        <source>Area</source>
+        <translation>Obszar</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
         <translation>Rysowanie z tłem</translation>
@@ -5248,19 +5243,23 @@ Utworzyć skrzyżowanie dla każdego przecięcia? (Niechciane skrzyżowania moż
         <translation>Etykieta z tłem</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
-        <source>Halo</source>
-        <translation>Halo</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
-        <source>Area</source>
-        <translation>Obszar</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Zawsze</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
-        <source>Global</source>
-        <translation>Główne</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Wybór koloru</translation>
     </message>
 </context>
 <context>
@@ -5311,6 +5310,11 @@ Co robić?</translation>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Okno dialogowe</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5324,6 +5328,11 @@ Co robić?</translation>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>Pliki SVG (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
         <translation>Wszystkie Pliki (*)</translation>
@@ -5333,86 +5342,144 @@ Co robić?</translation>
         <source>Image files (*.png *.jpg)</source>
         <translation>Pliki graficzne (*.png, *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Okno dialogowe</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
+        <source>Preferences</source>
+        <translation>Konfiguracja</translation>
     </message>
     <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>Pliki SVG (*.svg)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
+        <source>Visual</source>
+        <translation>Wygląd</translation>
     </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Wybór koloru</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
+        <source>General</source>
+        <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Narzędzie już istnieje</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
+        <source>Zoom Out/in (%)</source>
+        <translation>Powiększenie (%)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Narzędzie o tej nazwie już istnieje.
-Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfikować już istniejące.</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
+        <source>Opacity low/high</source>
+        <translation>Nieprzeźroczystość (niska/wysoka)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Nie można usunąć tego narzędzia</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
+        <source>Single mouse button interaction</source>
+        <translation>Obsługa pojedynczym klawiszem myszy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Nie można usunąc narzędzia "%1"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
+        <source>Use custom Qt style</source>
+        <translation>Użyj wbudowanego stylu Qt</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Tryb oddzielnego przesuwania</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Korzystanie z wirtualnych węzłów (wymagane ponowne uruchomienie)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Zaznaczanie ukrytych relacji</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
+        <source>Colors</source>
+        <translation>Kolory</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
+        <source>Background</source>
+        <translation>Tło</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
+        <source>Overwrite style</source>
+        <translation>Nadpisanie stylu</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>Ścieżka GPX</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
+        <source>Pixels</source>
+        <translation>pikseli</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Nie można zmodyfikować nazwy narzędzia</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Proste wyświetlanie ścieżek GPX</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Nie można zmodyfikować nazwy narzędzia "%1"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Interfejs</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Wybór pliku wykonywalnego</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Podświetlenie</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Relacje</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Zaznaczenie</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Wybór katalogu logów</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Podświetlenie</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
-        <source>Preferences</source>
-        <translation>Konfiguracja</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
@@ -5435,65 +5502,54 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Tłumaczenie standardowych etykiet</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
-        <source>Visual</source>
-        <translation>Wygląd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
+        <source>Rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
-        <source>General</source>
-        <translation>Ogólne</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
+        <source>Options</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
-        <source>Zoom Out/in (%)</source>
-        <translation>Powiększenie (%)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
+        <source>Use Anti-aliasing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
-        <source>Opacity low/high</source>
-        <translation>Nieprzeźroczystość (niska/wysoka)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
+        <source>Disable Anti-alisaing while panning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
-        <source>Colors</source>
-        <translation>Kolory</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
+        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
-        <source>Background</source>
-        <translation>Tło</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
+        <source>Use current style for wireframe rendering</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Podświetlenie</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
+        <source>Editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Zaznaczenie</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
+        <source>Quick editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Relacje</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
+        <source>Wireframe editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
+        <source>Full render editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
@@ -5501,6 +5557,33 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Styl mapy</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Katalog z własnymi stylami</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Aktualny styl</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Wyłączenie styli dla warstw ze ścieżkami</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Szablon</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Szablon etykiet</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
         <source>Built-in</source>
         <translation>Wbudowany</translation>
@@ -5511,19 +5594,30 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Użytkownika</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Wyłączenie styli dla warstw ze ścieżkami</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
         <source>Data</source>
         <translation>Dane</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Hasło:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
+        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
+        <source>XAPI</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
+        <source>URL:</source>
+        <translation>Adres URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
+        <source>Nominatim (Geo Search)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
@@ -5533,7 +5627,7 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
         <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
@@ -5551,140 +5645,105 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Automatycznie pobieranie ścieżek przy otwarciu</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
-        <source>Save NMEA log</source>
-        <translation>Zapisywanie logu NMEA</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation>Ustawianie czasu systemowego według GPS</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Sieć</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Ustawienia serwera proxy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Używanie serwera proxy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Adres:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation>Port:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
+        <source>Track layers readonly by default</source>
+        <translation>Warstwy ścieżek domyślnie są tylko do odczytu</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
+        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
+        <translation>Nie łącz ze sobą wezłów GPX oddalonych o więcej niż... (w km; 0 aby wyłączyć)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
-        <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
-        <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>Wejście GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
-        <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
-        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Port szeregowy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
-        <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
-        <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Komputer</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
-        <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
+        <source>Save NMEA log</source>
+        <translation>Zapisywanie logu NMEA</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
-        <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation>Ustawianie czasu systemowego według GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
-        <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation>Sieć</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
-        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation>Ustawienia serwera proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
-        <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation>Używanie serwera proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
-        <source>URL:</source>
-        <translation>Adres URL:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Hasło:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
-        <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Nazwa użytkownika:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Adres:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
@@ -5697,6 +5756,11 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Obraz tła</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation>Buforowanie kafli (nieaktywne dla Yahoo! z powodów prawnych)</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
         <source>Cache directory</source>
         <translation>Katalog pamięci podręcznej</translation>
@@ -5714,7 +5778,7 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
@@ -5747,78 +5811,6 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
-        <source>Pixels</source>
-        <translation>pikseli</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Szablon etykiet</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Szablon etykiet Merkaartor (*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Szablon</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
-        <source>Single mouse button interaction</source>
-        <translation>Obsługa pojedynczym klawiszem myszy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Buforowanie kafli (nieaktywne dla Yahoo! z powodów prawnych)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
-        <source>Overwrite style</source>
-        <translation>Nadpisanie stylu</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Tryb oddzielnego przesuwania</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
-        <source>Use custom Qt style</source>
-        <translation>Użyj wbudowanego stylu Qt</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
-        <source>Track layers readonly by default</source>
-        <translation>Warstwy ścieżek domyślnie są tylko do odczytu</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
-        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation>Nie łącz ze sobą wezłów GPX oddalonych o więcej niż... (w km; 0 aby wyłączyć)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Katalog z własnymi stylami</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Aktualny styl</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
         <source>English</source>
         <translation>Angielski</translation>
@@ -5839,6 +5831,11 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Czeski</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Holenderski</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
         <translation>Niemiecki</translation>
@@ -5869,6 +5866,11 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Polski</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>portugalski</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
         <source>Brazilian Portuguese</source>
         <translation>Portugalski (brazylijski)</translation>
@@ -5879,95 +5881,86 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Rosyjski</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Nazwa użytkownika:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Podświetlenie</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>Ścieżka GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Słowacki</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Proste wyświetlanie ścieżek GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Hiszpański</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>Wejście GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Szwedzki</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>ukraiński</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Port szeregowy</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Szablon etykiet Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Wybór koloru</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Komputer</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Narzędzie już istnieje</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Korzystanie z wirtualnych węzłów (wymagane ponowne uruchomienie)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Narzędzie o tej nazwie już istnieje.
+Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfikować już istniejące.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Holenderski</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Nie można usunąć tego narzędzia</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>portugalski</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Nie można usunąc narzędzia "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Słowacki</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Nie można zmodyfikować nazwy narzędzia</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Hiszpański</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Nie można zmodyfikować nazwy narzędzia "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Szwedzki</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Wybór pliku wykonywalnego</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>ukraiński</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Zaznaczanie ukrytych relacji</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Interfejs</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Wybór katalogu logów</translation>
     </message>
 </context>
 <context>
@@ -6059,20 +6052,20 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>WKT</translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
         <translation>Błąd w ciągu WKT</translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
         <translation>Nie można wyeksportować w postaci PROJ4</translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
         <translation>Blędny ciąg WKT</translation>
     </message>
@@ -6088,27 +6081,6 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
 <context>
     <name>PropertiesDock</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
-        <source>Properties</source>
-        <translation>Właściwości</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
-        <source>Error reading template file</source>
-        <translation>Błąd w trakcie wczytywania szablonu</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
-        <source>Center map</source>
-        <translation>Wyśrodkuj mapę</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
-        <source>Center && Zoom map</source>
-        <translation>Wyśrodkuj i powiększ mapę</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
         <source>%1/%1 selected item(s)</source>
         <translation>%1/%1 zaznaczonych element/ów</translation>
@@ -6129,9 +6101,9 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Właściwości - wiele elementów</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
-        <source>Properties - Relation</source>
-        <translation>Właściwości - Relacja</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Właściwości - węzeł</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
@@ -6139,41 +6111,39 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Właściwości - Droga</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
-        <source>Select member</source>
-        <translation>Wybierz członka</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
+        <source>Properties - Relation</source>
+        <translation>Właściwości - Relacja</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Właściwości - węzeł</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
+        <source>Properties</source>
+        <translation>Właściwości</translation>
     </message>
-</context>
-<context>
-    <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation>Eksportuj GPX...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
+        <source>Error reading template file</source>
+        <translation>Błąd w trakcie wczytywania szablonu</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
+        <source>Center map</source>
+        <translation>Wyśrodkuj mapę</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation>Czerpanie...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
+        <source>Center && Zoom map</source>
+        <translation>Wyśrodkuj i powiększ mapę</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation>Zaczerpnięto: %1</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
+        <source>Select member</source>
+        <translation>Wybierz członka</translation>
     </message>
+</context>
+<context>
+    <name>QApplication</name>
     <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
@@ -6200,6 +6170,29 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Przesuń węzeł %1</translation>
     </message>
     <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation>Eksportuj GPX...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation>Czerpanie...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation>Zaczerpnięto: %1</translation>
+    </message>
+    <message>
         <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Importuj plik osmChange</translation>
@@ -6210,29 +6203,29 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Importuj NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importuj NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
         <translation>Wykrywanie dróg Bing</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
         <translation>Nie ma dostępu do wyjścia.</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
         <translation>Brak poprawnych danych.</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
         <translation>Nie można rozpoznać wyników.</translation>
     </message>
@@ -6270,6 +6263,11 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>km/h</translation>
     </message>
     <message>
+        <location filename="../src/GPS/qgps.cpp" line="147"/>
+        <source>Unavailable</source>
+        <translation>Niedostępne</translation>
+    </message>
+    <message>
         <location filename="../src/GPS/qgps.cpp" line="153"/>
         <source>2D</source>
         <translation>2D</translation>
@@ -6289,21 +6287,16 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
-    <message>
-        <location filename="../src/GPS/qgps.cpp" line="147"/>
-        <source>Unavailable</source>
-        <translation>Niedostępne</translation>
-    </message>
 </context>
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Błąd logowania GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Nie można utworzyć logu GPS: %1.</translation>
     </message>
@@ -6311,17 +6304,17 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>Nie można połączyć z %1:%2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Błąd logowania GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Nie można utworzyć logu GPS: %1.</translation>
     </message>
@@ -6407,95 +6400,139 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< S E P A R A T O R ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>Dostosowanie paska narzędzi</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Operacje</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation>Paski narzędzi</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation>Przywróć wszystko</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Zastosuj</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>Góra</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation>W dół</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
         <translation>Bierzące działania paska narzędzi</translation>
     </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< S E P A R A T O R ></translation>
+    </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation>Dostosowany pasek narzędzi</translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6513,6 +6550,14 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Usuń wybranych członków/a</translation>
     </message>
     <message>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
         <translation>Etykiety</translation>
@@ -6532,14 +6577,6 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <source>Remove selected tag(s)</source>
         <translation>Usuń wybrane etykiety/a</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
 </context>
 <context>
     <name>RoadProperties</name>
@@ -6620,6 +6657,11 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <translation>Nazwa</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
         <translation>Zapytanie</translation>
@@ -6629,11 +6671,6 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <source>Maximum returned results (0 for all)</source>
         <translation>Maksymalna ilość wyników (0 - nieograniczona)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Id</translation>
-    </message>
 </context>
 <context>
     <name>SlippyMapWidget</name>
@@ -6646,12 +6683,12 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
         <translation>Odświerz warstwę</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -6675,6 +6712,16 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>Wyślij do Openstreetmap</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation>Proszę podać komentarz do tego zestawu zmian</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>Proszę dokładnie przejrzeć zmiany wysyłane do OSM</translation>
@@ -6689,16 +6736,6 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Wyślij do Openstreetmap</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Proszę podać komentarz do tego zestawu zmian</translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
@@ -6742,7 +6779,7 @@ Proszę wybrać inną nazwę lub kliknąć przycisk <Zastosuj> aby zmodyfi
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6756,6 +6793,21 @@ p, li { white-space: pre-wrap; }
         <translation>Rzut:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Merkator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Szerokość/Wysokość (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>Początek w lewym dolnym rogu</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
         <translation>Rozmiar kafla:</translation>
@@ -6781,21 +6833,6 @@ p, li { white-space: pre-wrap; }
         <translation>URL licencji:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Merkator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Szerokość/Wysokość (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>Początek w lewym dolnym rogu</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
         <translation>Zastosuj</translation>
@@ -6811,24 +6848,18 @@ p, li { white-space: pre-wrap; }
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: PobierzUsługi</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Adres i ścieżka nie mogą być puste.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Nie można pobrać: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Błąd podczas wczytywania usług.
@@ -6968,55 +6999,55 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Wyodrębnij - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation>Ilość segmentów trasy</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Całkowita odległość</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Całkowity czas trwania</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Wyodrębnij - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Wyodrębnij rysowaną warstwę</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Powiększ</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -7115,12 +7146,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Powiększ</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Wyczyść</translation>
     </message>
@@ -7128,35 +7159,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: Pobierz właściwości</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adres i ścieżka nie mogą być puste.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Nie można pobrać: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation>Brak nazwy</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Błąd podczas wczytywania właściwości.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>Ustawienia serwerów WMS</translation>
@@ -7177,31 +7179,26 @@ p, li { white-space: pre-wrap; }
         <translation>Nazwa:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>Adres serwera:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>Warstwy:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>Rzut:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>Format obrazka:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Style:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -7210,6 +7207,11 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">To jest serwer pośredniczący WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;&quo [...]
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>Rzut:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
         <translation>Kafelkuj</translation>
@@ -7220,6 +7222,16 @@ p, li { white-space: pre-wrap; }
         <translation>Stopnie powiększenia</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation>Format obrazka:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Style:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
         <translation>zawartość etykiety "source":</translation>
@@ -7245,14 +7257,33 @@ p, li { white-space: pre-wrap; }
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>Adres serwera:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: Pobierz właściwości</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Adres i ścieżka nie mogą być puste.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Błąd podczas wczytywania właściwości.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Nie można pobrać: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation>Brak nazwy</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_pt.ts b/translations/merkaartor_pt.ts
index fc6bc3b..acd7e01 100644
--- a/translations/merkaartor_pt.ts
+++ b/translations/merkaartor_pt.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pt">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,57 +24,57 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished"></translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Registo de alterações</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -84,93 +82,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Exportar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Predefinição</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Carregar tema do atalho</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Tema do atalho Merkaartor (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 não pode ser aberto.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Todos os Ficheiros (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 não pode ser aberto para escrita.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -214,25 +242,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="195"/>
@@ -250,16 +275,16 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="14"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="37"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -270,9 +295,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -305,13 +330,13 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="358"/>
         <location filename="../src/Sync/DirtyList.cpp" line="639"/>
         <source>UPDATE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="366"/>
         <location filename="../src/Sync/DirtyList.cpp" line="670"/>
         <source>UPDATE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="374"/>
@@ -323,13 +348,13 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="382"/>
         <location filename="../src/Sync/DirtyList.cpp" line="761"/>
         <source>REMOVE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="390"/>
         <location filename="../src/Sync/DirtyList.cpp" line="788"/>
         <source>REMOVE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="423"/>
@@ -348,28 +373,28 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="447"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
         <source>
 API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="464"/>
         <source>Uploading changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="490"/>
         <source>OPEN changeset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="517"/>
         <source>CLOSE changeset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -390,35 +415,35 @@ API message is '%1'</source>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="68"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="70"/>
         <source>
 API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="86"/>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
         <source>Checking changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="184"/>
         <source>OPEN changeset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="301"/>
         <source>CLOSE changeset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="354"/>
@@ -438,12 +463,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="399"/>
         <source>UPDATE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="414"/>
         <source>UPDATE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="428"/>
@@ -458,108 +483,108 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="456"/>
         <source>REMOVE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="470"/>
         <source>REMOVE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Camada suja</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Imagens de fundo</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -587,12 +612,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -607,248 +632,237 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="119"/>
         <source>Resolve all relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Transferência falhada</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 transferido</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>A descarregar não-resolvido...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>A transferir da OSM (%n bytes)</numerusform>
-            <numerusform>A transferir da OSM (%n bytes)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>A transferir da OSM (%n kBytes)</numerusform>
-            <numerusform>A transferir da OSM (%n kBytes)</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>A descarregar não-resolvido %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>A Transferir...</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Pareamento não resolvido %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>A transferir da OSM (a conectar)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>A parsear...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>A Parsear XML</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Conflitos com origem em %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Estradas/relações apagadas</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Estradas/relações vazias são provavelmente erros.
+Deseja marcar-las para apagar?</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Por favor resolva primeiro o conflito existente</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>Os conflitos forma removidos</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>A parsear...</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>A Parsear XML</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>A descarregar Pontos-de-rota %1-%2</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Rota descarregada - nós %1-%2</translation>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 transferido</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>A Transferir...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>A descarregar não-resolvido...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>A transferir da OSM (a conectar)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>A descarregar não-resolvido %1 de %2</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Pareamento não resolvido %1 de %2</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Conflitos com origem em %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Transferência falhada</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>Os conflitos forma removidos</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Estradas/relações apagadas</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Por favor resolva primeiro o conflito existente</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Estradas/relações vazias são provavelmente erros.
-Deseja marcar-las para apagar?</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>A descarregar Pontos-de-rota %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Rota descarregada - nós %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>A transferir %1,%2 (zoom %3)...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>A transferir %1,%2 (zoom %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Fechar</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
+        <source>Zoom</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
-        <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Fechar</translation>
     </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -861,7 +875,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="25"/>
         <source>What do you want to export?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="38"/>
@@ -871,12 +885,12 @@ Delete what can be?</source>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="45"/>
         <source>Viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="52"/>
         <source>Selected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -914,12 +928,12 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="442"/>
         <source>Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="443"/>
         <source>Roads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="444"/>
@@ -947,12 +961,12 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -970,7 +984,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="30"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
@@ -981,7 +995,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -991,17 +1005,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="47"/>
         <source>Filter list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="76"/>
@@ -1011,7 +1025,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="93"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
@@ -1031,241 +1045,241 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="141"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Imagens Geo</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Centrar mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Copiar o nome do ficheiro para o quadro</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
         <translation>Pág abaixo</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
         <translation>Pág. acima</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Carregar imagens Geo-etiquetadas</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>A carregar imagens ...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Abortar carregamento</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation>Ficheiro inexistente</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>Não é possivel encontrar a imagem "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation>Erro ao abrir "%2":
 %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
         <translation>Erro ao carregar informação-EXIF de "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Centrar mapa</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>fim da Rota.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>começo da Rota</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints</source>
         <translation>Nenhum Ponto-de-rota</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints found for image "%1"</source>
         <translation>Nenhum Ponto-de-rota foi encontrado na imagem "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>A imagem "%1" foi tirada %2 antes do último ponto-de-rota ter sido gravado.
 Ainda quer usá-la ?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>A imagem "%1" foi tirada %2 depois do último ponto-de-rota ter sido gravado.
 Ainda quer usá-la ?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Erro ao abrir  "%1":
@@ -1275,32 +1289,6 @@ Ainda quer usá-la ?</translation>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Url do OSM inválida</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Formato das coordenadas inválida</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>As coordenadas tem de ser: '<left lon>, <bottom lat>, <right lon>, <top lat>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>As coordenadas tem de ser: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Ir Para</translation>
@@ -1313,27 +1301,27 @@ Ainda quer usá-la ?</translation>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
         <source>lonMin, latMin, lonMax, latMax</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="134"/>
         <source>latCent, lonCent, latSpan, lonSpan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="156"/>
@@ -1354,230 +1342,158 @@ Ainda quer usá-la ?</translation>
         <location filename="../src/common/GotoDialog.ui" line="225"/>
         <location filename="../src/common/GotoDialog.ui" line="244"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Url do OSM inválida</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Formato das coordenadas inválida</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>As coordenadas tem de ser: '<left lon>, <bottom lat>, <right lon>, <top lat>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>As coordenadas tem de ser: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
+    </message>
+</context>
+<context>
+    <name>ImageLayerWidget</name>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Mapa - nenhum</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Mapa - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Mapa - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Mapa - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Longitude</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Latitude</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Projecção inválida</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Ficheiro inválido</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 não pode ser aberto.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Todos os Ficheiros (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 não pode ser aberto para escrita.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Caixa de diálogo</translation>
@@ -1585,14 +1501,14 @@ Do you really want to exit?</source>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
         <source>Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1600,22 +1516,22 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
         <source>Specifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
         <source>First line contains headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
@@ -1625,27 +1541,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
         <source>Colon (,)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="131"/>
         <source>Semicolon (;)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="138"/>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="145"/>
         <source>Other:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1655,80 +1571,178 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
         <source>Projection (in PROJ4 format; leave blank for latitude/longitude)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="227"/>
         <source>Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="254"/>
         <source>Field list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
         <source>Field Type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="310"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="336"/>
         <source>Import range</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="342"/>
         <source>From (0 from start):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="352"/>
         <source>To (0 to End):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="367"/>
         <source>Load settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="374"/>
         <source>Save settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Longitude</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Latitude</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Projecção inválida</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Ficheiro inválido</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 não pode ser aberto.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Todos os Ficheiros (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 não pode ser aberto para escrita.</translation>
     </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1742,21 +1756,18 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n funções</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Funcionalidades</translation>
     </message>
@@ -1767,7 +1778,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
         <source>Show All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="248"/>
@@ -1778,12 +1789,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="255"/>
         <source>Readonly All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="260"/>
         <source>Readonly None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="267"/>
@@ -1803,81 +1814,81 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
         <source>Tracks</source>
         <translation>Rota</translation>
     </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Opaco</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Opacidade</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1885,17 +1896,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1909,2576 +1920,2628 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Limpar rótulo '%1' no %2</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Ajuda</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Criar interacção na área</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Criar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Criar Área %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Estrada</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Área: Criar Estrada %1</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Editar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Adicionar buraco</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Ver</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Deseja adicionar um/outro buraco nesta área?</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Marcadores</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Área: Terminar Estrada %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Área: Adicionar nó %1 à estrada %2</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Ficheiro</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Exportar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Adicionar nós à estrada de dois sentidos %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Crear estrada de dois sentidos %1</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Criar novo nó de interacção</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Criar nó na estrada: %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Estilo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>LEFT-CLICK para começar;DRAG para escala;SHIFT-DRAG para rodar;LEFT-CLICK para concluir</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Nó</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Criar um poligno de interacção</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Janela</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Criar poligno %1</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Docas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Criar rotunda de interacção</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Fu&nção</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Criar rotunda %1</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Criar caminho de interacção</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Camadas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Criar Nó %1 na Estrada %2</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Criar estrada: %1</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Criar nó: %1</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Adicionar nó %1 à estrada %2</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Sair</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&Sobre</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Editar interacção</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Abrir</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Criar novo documento e importar um ficheiro</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Mover Nós</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Mover nó %1</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Encontrados nós na mesma posição.</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Deseja fundir todos os nós na posição de descarga?</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Fundir nós no %1</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>LEFT-CLICK para seleccionar;LEFT-DRAG para mover</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Mover interecção do nó</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Ligação curvada</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Anular</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>LEFT-CLICK para a primeira esquina -> LEFT-DRAG numa área especifica -> LEFT-CLICK para ampliar</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Refazer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Mover</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Não pode carregar os ficheiros de projeccção</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Baixo</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importar um ficheiro para o documento actual</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Alto</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Tranferir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Opaco</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Transferir dados do mapa para uma nova área</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Ligação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Criar ligação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Seleccionar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Camadas</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Enviar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Funcionalidade</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Nó</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Criar nova estrada</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Criar novo nó</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Voltar atrás</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Ir Para...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Traçado de duas vias</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Criar um Traçado de duas vias</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Criar rotunda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Novo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Criar novo documento</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Dividir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Quadro inválido</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>O quadro não contem informação válida.</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Unir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>juntar estradas  ligadas a uma unica estrada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Separar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Interromper</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Separar as estradas ligadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Rota %1</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Grande Aviso de Direitos de Autor</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Criar relação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Sem ficheiro válido</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Área</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 não pode ser aberto.</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Criar nova área</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Editar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Carregar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Versão Qt antiga foi detectada</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Rua curvada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Preferências...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Todos...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Esportar todas as camadas visiveis para um ficheiro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Erro a transferir</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Procurar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Localizar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Procurar e seleccionar items</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Exportar as funções no quadro de vista para um ficheiro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Adicionar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Criar Poligno</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Remover...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Fundir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Juntar estradas</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Fundir nó</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Fundir os nós seleccionados (os seleccionados primeiro vão permanecer)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Interromper Estradas</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Guardar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Forçar o carregamento de funções</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Transferir mais</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Transferir mais dados do mapa para a área actual</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Tranferência da vista actual para a camada anteriormente transferida.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Criar junção</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Intersecções multiplas.</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Propriedades</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Esconder/Mostar o acoplador Propriedades</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Adicionar numeros às Ruas</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Esconder/Mostar o acoplador Camadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Informação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Esconder/Mostar o acoplador Informação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Alinhar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Alinhar nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Alinhar os nós seleccionados. Os primeiros dois seleccionados a dar uma linha.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Esconder/Mostar o acoplador Desfazer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Copiar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Alinhar Nós</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Copiar as aplicações e rótulos para o quadro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Copiar as etiquetas das funções seleccionadas para a Área de transferência; se a função for um ponto-de-rota, copiar também as coordenadas.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Separar nó %1</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Adicionar membro à relação</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Colar Etiquetas (&Substituir)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Colar (e sobrepor) as etiquetas na Área de transferência para a função seleccionada.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Colar Etiquetas (&Unir)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Colar Etiquetas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Colar Etiquetas a partir da Área de Transferência (unir com as existentes)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Criar relação %1</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Unir as etiquetas da Área de transferência com as da função seleccionada.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Estilo de mapa Merkaartor (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Carregar o estilo do mapa</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Colar Função</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Colar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>Formato de troca GPS (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Colar Funções a partir da Área de Transferência</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>Formato OpenStreetMap (*.osb)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Colar  as Funções a partir da Área de Transferência: Se a ID da função já existir no documento, substitui-la.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Formato GPSPlot Noni (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>Formato de registo GPS NMEA (*.nmea *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binário)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>Ficheiro KML (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Forçar envio</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Consignar aplicação à camada suja</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Imagens Geo-etiquetadas (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Aplicar a função seleccionada de uma camada não-transferível  (e.g.Traçar ou extrair) sobre a camada suja, pronta a ser enviada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>ESRI Shapefile (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Documento Merkaartor (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Esconder/Mostrar a barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Ocultar tudo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>&Imagem da camada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Iniciar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Ficheiros de documentos Merkaartor (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Voltar a realizar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Todos os Ficheiros (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Esconder/Mostar o acoplador GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 não pode ser aberto para escrita.</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Ficheiro inválido</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centro no GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 não é um documento válido do Merkaartor.</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Mostrar &segmentos de rota</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Exportar OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>Ficheiros OSM (*.osb)</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Exportar GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Ficheiros GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Esportar KML</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Ficheiro KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Pausar GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Adicionar Marcador</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoImagem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Esconder/Mostar o acoplador Imagem GEO</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Nome de Favorito inválido</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>O marcador não pode estar em branco</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Editor de Atalhos...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Introduzir um novo, manter o mesmo para substituir ou cancelar.</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Fundir...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Gravar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Adicionar membro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Projecção inválida</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Remover membro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Nunca</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>Erro GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Sempre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Abrir ficheiro de log NMEA</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Destacar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Separar nó da estrada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Modelos de etiqueta Merkaartor (*.mat)</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Separar o nó da estrada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Abrir Modelos de etiqueta</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Trabalhar Offline</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Estilos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Ajuda</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Esconder/Mostar o acoplador Estilos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Criar</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Estrada</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Editar</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Ver</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Reinicar estado de Diálogos descartáveis</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Marcadores</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Menu GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Câmara</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Criar &junção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Ficheiro</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Exportar</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Funcionalidades</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Estilo</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Adicionar ruas &numeros (Esquema Karlsruhe)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Nó</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Janela</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Docas</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Fu&nção</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Camadas</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Sair</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&Sobre</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Abrir</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Criar novo documento e importar um ficheiro</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Ligação curvada</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Anular</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Refazer</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Mover</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importar</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importar um ficheiro para o documento actual</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Tranferir</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Transferir dados do mapa para uma nova área</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Ligação</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Criar ligação</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Seleccionar</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Enviar</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Apagar</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Criar nova estrada</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Criar novo nó</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Voltar atrás</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Ir Para...</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Transferir as dependências em falta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Traçado de duas vias</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Criar um Traçado de duas vias</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Criar rotunda</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Limpar rótulo '%1' no %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Novo</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Criar novo documento</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Dividir</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Unir</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Criar novo nó de interacção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>juntar estradas  ligadas a uma unica estrada</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Criar nó na estrada: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Criar interacção na área</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Separar</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Criar Área %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Interromper</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Área: Criar Estrada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Separar as estradas ligadas</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Adicionar buraco</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Deseja adicionar um/outro buraco nesta área?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Área: Terminar Estrada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Criar relação</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Área: Adicionar nó %1 à estrada %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Área</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Criar nova área</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Editar...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Adicionar nós à estrada de dois sentidos %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Gravar...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Crear estrada de dois sentidos %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Carregar...</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>LEFT-CLICK para começar;DRAG para escala;SHIFT-DRAG para rodar;LEFT-CLICK para concluir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Rua curvada</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Criar um poligno de interacção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Preferências...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Criar poligno %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Todos...</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Criar rotunda de interacção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Esportar todas as camadas visiveis para um ficheiro</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Criar rotunda %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Procurar...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Criar caminho de interacção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Localizar</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Criar Nó %1 na Estrada %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Procurar e seleccionar items</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Criar estrada: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Criar nó: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Exportar as funções no quadro de vista para um ficheiro</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Adicionar nó %1 à estrada %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Adicionar...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Remover...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Fundir</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Fundir nó</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Editar interacção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Fundir os nós seleccionados (os seleccionados primeiro vão permanecer)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Apagar dependência.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Guardar</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Transferir mais</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>LEFT-CLICK para seleccionar;LEFT-DRAG para mover</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Transferir mais dados do mapa para a área actual</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Mover interecção do nó</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Tranferência da vista actual para a camada anteriormente transferida.</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Mover Nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Mover nó %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Propriedades</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Encontrados nós na mesma posição.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Esconder/Mostar o acoplador Propriedades</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Deseja fundir todos os nós na posição de descarga?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Fundir nós no %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Esconder/Mostar o acoplador Camadas</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informação</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Esconder/Mostar o acoplador Informação</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Alinhar</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Alinhar nós</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>LEFT-CLICK para a primeira esquina -> LEFT-DRAG numa área especifica -> LEFT-CLICK para ampliar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Alinhar os nós seleccionados. Os primeiros dois seleccionados a dar uma linha.</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>Formato de troca GPS (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>Formato OpenStreetMap (*.osb)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Formato GPSPlot Noni (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Esconder/Mostar o acoplador Desfazer</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>Formato de registo GPS NMEA (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>Ficheiro KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Imagens Geo-etiquetadas (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Copiar</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>ESRI Shapefile (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Copiar as aplicações e rótulos para o quadro</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Copiar as etiquetas das funções seleccionadas para a Área de transferência; se a função for um ponto-de-rota, copiar também as coordenadas.</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Colar Etiquetas (&Substituir)</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Documento Merkaartor (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Colar (e sobrepor) as etiquetas na Área de transferência para a função seleccionada.</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Todos os Ficheiros (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Colar Etiquetas (&Unir)</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Não pode carregar os ficheiros de projeccção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Colar Etiquetas</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Colar Etiquetas a partir da Área de Transferência (unir com as existentes)</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Baixo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Unir as etiquetas da Área de transferência com as da função seleccionada.</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Opaco</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Funcionalidade</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Nó</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Camadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Quadro inválido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>O quadro não contem informação válida.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Transferir as dependências em falta</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Rota %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Grande Aviso de Direitos de Autor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Sem ficheiro válido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Colar</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 não pode ser aberto.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Colar Funções a partir da Área de Transferência</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Colar  as Funções a partir da Área de Transferência: Se a ID da função já existir no documento, substitui-la.</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binário)</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Forçar envio</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Versão Qt antiga foi detectada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Consignar aplicação à camada suja</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Aplicar a função seleccionada de uma camada não-transferível  (e.g.Traçar ou extrair) sobre a camada suja, pronta a ser enviada</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Erro a transferir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Esconder/Mostrar a barra de ferramentas</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Ocultar tudo</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>&Imagem da camada</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Criar Poligno</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Juntar estradas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Interromper Estradas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Forçar o carregamento de funções</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Criar junção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Intersecções multiplas.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Adicionar numeros às Ruas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Iniciar</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Voltar a realizar</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Esconder/Mostar o acoplador GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Alinhar Nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Separar nó %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Adicionar membro à relação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centro no GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Mostrar &segmentos de rota</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Criar relação %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Estilo de mapa Merkaartor (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Carregar o estilo do mapa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pausar</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Pausar GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eoImagem</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Esconder/Mostar o acoplador Imagem GEO</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Ficheiros de documentos Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Editor de Atalhos...</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 não pode ser aberto para escrita.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Fundir...</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Adicionar membro</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Ficheiro inválido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Remover membro</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 não é um documento válido do Merkaartor.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nunca</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Exportar OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>Ficheiros OSM (*.osb)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Sempre</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Destacar</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Separar nó da estrada</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Exportar GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Separar o nó da estrada</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Ficheiros GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Trabalhar Offline</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Esportar KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Ficheiro KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Estilos</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Esconder/Mostar o acoplador Estilos</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Reinicar estado de Diálogos descartáveis</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Menu GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Adicionar Marcador</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Câmara</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Criar &junção</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Nome de Favorito inválido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>O marcador não pode estar em branco</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Colar Função</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Introduzir um novo, manter o mesmo para substituir ou cancelar.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Funcionalidades</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Adicionar ruas &numeros (Esquema Karlsruhe)</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Projecção inválida</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>Erro GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Abrir ficheiro de log NMEA</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Fechar</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Modelos de etiqueta Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Abrir Modelos de etiqueta</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Apagar dependência.</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Unresolved conflicts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Please resolve existing conflicts first</source>
         <translation>Por favor resolva primeiro o conflito existente</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
         <source>It is strongly recommended to save the changes to your document after an upload.
 Do you want to do this now?</source>
         <translation>É fortemente recomendado salvar as alterações ao seu documento depois de um envio.
@@ -4488,232 +4551,191 @@ Deseja fazer isto agora?</translation>
         <location filename="../src/common/TagModel.cpp" line="131"/>
         <location filename="../src/common/TagModel.cpp" line="162"/>
         <source>Set Tags on multiple features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="133"/>
         <location filename="../src/common/TagModel.cpp" line="164"/>
         <source>Set Tags on %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
+        <source><i>V: </i><b>%1</b> </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
+        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
+        <translation><i>ultimo: </i><b>%1</b&gt; by <b>%2</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>ultimo: </i><b>%1</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
+        <source><br/><i>layer: </i><b>%1</b> </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
-        <source><i>V: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
-        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>ultimo: </i><b>%1</b&gt; by <b>%2</b&gt;</translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>ultimo: </i><b>%1</b&gt;</translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Nó</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
-        <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>velocidade</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>tamanho</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Membro</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Comprimento</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>%1 nós</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Área</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>velocidade</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation type="unfinished"></translation>
+    <message>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>%1 nós</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Área</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Nó</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4725,22 +4747,32 @@ Deseja fazer isto agora?</translation>
         <translation>Novo Marcador</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Duplicar chave</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Mais de 150 preferências</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
         <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
         <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
@@ -4759,7 +4791,7 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="33"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="53"/>
@@ -4769,25 +4801,25 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="73"/>
         <source>Selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4798,25 +4830,10 @@ Deseja fazer isto agora?</translation>
         <translation>Erro!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>A Máquina do Serviço de procura de nomes não foi encontrada.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>A Máquina do Serviço de procura de nomes recusou a ligação.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>O Serviço de procura de nomes requer autenticação.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4837,15 +4854,15 @@ Deseja fazer isto agora?</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
@@ -4862,7 +4879,7 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>SVG files (*.svg)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4870,62 +4887,62 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
         <source>min lat/Lon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="90"/>
         <source>max lat/Lon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
         <source>Show Scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4938,7 +4955,7 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="25"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="35"/>
@@ -4949,36 +4966,17 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="74"/>
         <source>User:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Sempre</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Editor do estilo do mapa</translation>
@@ -5011,9 +5009,34 @@ Deseja fazer isto agora?</translation>
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>Espessura fixa</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
@@ -5023,7 +5046,7 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
@@ -5033,23 +5056,23 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
         <source>Tag selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
         <source>meter/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
         <source>Visible up to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
         <source>Visible from scale</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5059,31 +5082,6 @@ Deseja fazer isto agora?</translation>
         <translation>Desenhar com cor</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>Espessura fixa</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5093,7 +5091,7 @@ Deseja fazer isto agora?</translation>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
         <source>off</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
@@ -5103,7 +5101,7 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5113,17 +5111,17 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
         <source>Touchup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="981"/>
@@ -5138,7 +5136,7 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5168,265 +5166,124 @@ Deseja fazer isto agora?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
         <source>Draw with background color</source>
-        <translation>desenhar com a cor do fundo</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
-        <source>Label with background tag</source>
-        <translation>Rótulo com Etiqueta de fundo</translation>
-    </message>
-</context>
-<context>
-    <name>PhotoLoadErrorDialog</name>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
-        <source>No Valid geotag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
-        <source>This photo does not contain geo-tagging EXIF data.
-What do you want to do next?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
-        <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
-        <source>Load without associated node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
-        <source>Extract info from barcode (Walking Papers)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
-        <source>Ignore it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
-        <source>Do this for all current photos.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PictureViewerDialog</name>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Output filename</source>
-        <translation>Ficheiro de resultado</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>untitled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Todos os Ficheiros (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation>Ficheiros de imagem (*.png *.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Caixa de diálogo</translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>Inglês</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Árabico</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Checo</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>Alemão</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>Francês</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Italiano</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Português do Brasil</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Directória dos estilos personalizados</translation>
+        <translation>desenhar com a cor do fundo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
+        <source>Label with background tag</source>
+        <translation>Rótulo com Etiqueta de fundo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Modelo de etiqueta Merkaartor (*.mat)</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Sempre</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
         <source>Select Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PhotoLoadErrorDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
+        <source>No Valid geotag</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Uma ferramenta com este nome já existe.
-Por favor seleccione outro nome ou clique no <Apply> botão se pretende modificar o já existente</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Não pode apagar a ferramenta</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
+        <source>This photo does not contain geo-tagging EXIF data.
+What do you want to do next?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Não pode apagar a ferramenta "%1"</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
+        <source>Try to match with a track node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Não pode modificar o nome da ferramenta</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
+        <source>Load without associated node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Não pode modificar o nome da ferramenta "%1"'</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
+        <source>Extract info from barcode (Walking Papers)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
+        <source>Ignore it</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
+        <source>Do this for all current photos.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PictureViewerDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Caixa de diálogo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Output filename</source>
+        <translation>Ficheiro de resultado</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>untitled</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Localizar</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>Todos os Ficheiros (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation>Ficheiros de imagem (*.png *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
         <source>Visual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
@@ -5436,7 +5293,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
         <source>Zoom Out/in (%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
@@ -5444,19 +5301,34 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <translation>Opacity baixa/alta</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
         <source>Use custom Qt style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
@@ -5490,9 +5362,9 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <translation>Sobrepôr estilo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Pairar</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>Rota GPX</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5505,160 +5377,187 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <translation>Pixeis</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Destaque</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Foco</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>Rota GPX</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
         <source>Use simple GPX track appearance</source>
         <translation>Use aparência simples na Rota GPX</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Estilo do mapa</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Estilo actual</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Desactivar estilos para as camadas de rota</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Pairar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Embutido</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Personalizado</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Foco</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Dados</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Destaque</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Senha:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Localizar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Documentos</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Estilo do mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Directória dos estilos personalizados</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Estilo actual</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Desactivar estilos para as camadas de rota</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Embutido</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Personalizado</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Dados</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
+        <source>Nominatim (Geo Search)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Documentos</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
-        <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
@@ -5688,12 +5587,12 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5708,18 +5607,18 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
         <source>gpsd</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
         <source>Serial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
@@ -5729,12 +5628,12 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
         <source>Set system time to GPS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
@@ -5744,22 +5643,27 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
         <source>Proxy settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
         <source>Use Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Senha:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
         <source>User:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
@@ -5769,12 +5673,12 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
         <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
@@ -5784,7 +5688,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
         <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
@@ -5804,12 +5708,12 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
         <source>Tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
@@ -5834,12 +5738,27 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>Inglês</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Árabico</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Checo</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
@@ -5847,39 +5766,131 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <translation>Neerlandês</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>Alemão</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>Francês</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Italiano</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
         <source>Portuguese</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>Português do Brasil</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
         <source>Slovak</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
         <source>Spanish</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
         <source>Swedish</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
         <source>Ukrainian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Modelo de etiqueta Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Uma ferramenta com este nome já existe.
+Por favor seleccione outro nome ou clique no <Apply> botão se pretende modificar o já existente</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Não pode apagar a ferramenta</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Não pode apagar a ferramenta "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Não pode modificar o nome da ferramenta</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Não pode modificar o nome da ferramenta "%1"'</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5887,17 +5898,17 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="14"/>
         <source>Projections setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="20"/>
         <source>Projections</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="47"/>
         <source>Projection list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="76"/>
@@ -5907,7 +5918,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="93"/>
         <source>PROJ4 string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
@@ -5927,12 +5938,12 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="141"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5940,7 +5951,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5953,40 +5964,40 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5994,7 +6005,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/common/PropertiesDialog.ui" line="14"/>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6012,33 +6023,38 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
         <source>Selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
         <source>Properties - Multiple elements</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
         <source>Properties - Relation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
@@ -6053,40 +6069,12 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
         <source>Select member</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Limpeza em cascada</translation>
@@ -6096,7 +6084,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <location filename="../src/Commands/FeatureCommands.cpp" line="74"/>
         <location filename="../src/Commands/FeatureCommands.cpp" line="188"/>
         <source>Set Tag '%1=%2' on %3</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="314"/>
@@ -6112,9 +6100,32 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <translation>Mover nó %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportNGT.cpp" line="21"/>
@@ -6122,31 +6133,31 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <translation>Importar NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importar NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6162,14 +6173,14 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6179,12 +6190,12 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/GPS/qgps.cpp" line="140"/>
         <source>km/h</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="147"/>
         <source>Unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="153"/>
@@ -6199,7 +6210,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6210,32 +6221,32 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Registo de erros GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Registo de erros GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6249,7 +6260,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="22"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="29"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="63"/>
@@ -6295,7 +6306,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="138"/>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="148"/>
@@ -6319,92 +6330,136 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6422,7 +6477,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
@@ -6435,22 +6490,22 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6463,7 +6518,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="34"/>
         <source>xxx</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="41"/>
@@ -6473,22 +6528,22 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="61"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6509,7 +6564,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="14"/>
         <source>Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="25"/>
@@ -6519,7 +6574,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="32"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="45"/>
@@ -6539,12 +6594,12 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6552,18 +6607,18 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="277"/>
         <source>Reset view</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -6573,7 +6628,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Docks/StyleDock.cpp" line="102"/>
         <source>Styles</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6581,7 +6636,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Docks/StyleDock.ui" line="14"/>
         <source>Styles</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6589,7 +6644,7 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
         <source>Upload to Openstreetmap</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
@@ -6617,17 +6672,17 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
         <source>TMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="20"/>
         <source>TMS Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="47"/>
         <source>Server list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="78"/>
@@ -6637,71 +6692,71 @@ Por favor seleccione outro nome ou clique no <Apply> botão se pretende mo
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="99"/>
         <source>Server Url:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="111"/>
         <source>Get Services</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="133"/>
         <source>Services :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="143"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
         <source>Projection:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
@@ -6716,30 +6771,24 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="303"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Endereço e Caminho não podem estar em branco.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>A transferência foi mal-sucedida: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6752,7 +6801,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TagModel.cpp" line="107"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.h" line="22"/>
@@ -6770,17 +6819,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
         <source>AND</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6790,12 +6839,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6803,7 +6852,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/TagTemplate/TagTemplate.cpp" line="196"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6811,7 +6860,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/TagTemplate/TagTemplate.cpp" line="913"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6819,111 +6868,111 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
         <source>For example "1-9;15-17;19,19A"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
         <source>All numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Extrair - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Extrair - %1</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Extrair a camada a desenhar</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -6953,27 +7002,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="58"/>
         <source>xxx</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="81"/>
         <source>Tags</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -6991,7 +7040,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="36"/>
         <source>Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="49"/>
@@ -7001,17 +7050,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="56"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="63"/>
         <source>Use proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="88"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="104"/>
@@ -7022,12 +7071,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
@@ -7035,48 +7084,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Endereço e Caminho não podem estar em branco.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>A transferência foi mal-sucedida: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Erro a ler capaciadades.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="20"/>
         <source>WMS Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="47"/>
         <source>Server list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="78"/>
@@ -7086,7 +7106,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
         <source>Server Url:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
@@ -7103,44 +7123,44 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
         <source>Projection:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
         <source>Zoom levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
         <source>Image format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
         <source>Styles:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7155,7 +7175,36 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="348"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Endereço e Caminho não podem estar em branco.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Erro a ler capaciadades.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>A transferência foi mal-sucedida: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_pt_BR.ts b/translations/merkaartor_pt_BR.ts
index b0bded7..2db6fd9 100644
--- a/translations/merkaartor_pt_BR.ts
+++ b/translations/merkaartor_pt_BR.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,13 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor versão</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -39,7 +32,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (compilado com <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -52,7 +45,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 versão</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -65,26 +58,26 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL versão</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Copyright Bart Vanhauwaert, Chris Browet e outros, 2006-2012</translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
         <translation>Este programa está licenciado sob os termos da Licença Pública Geral GNU v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -93,12 +86,12 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Registro de mudanças</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -106,93 +99,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Atalho</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Exportar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>Pa&drão</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Editor de Atalhos</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Carregar esquema de atalho</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Esquema de atalhos Merkaator (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Não foi possível abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 não pode ser aberto.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Salvar esquema de atalhos</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>Sem título</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Todos os arquivos (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Não foi possível abrir arquivo salvo</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 não pode ser aberto para escrita.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -246,10 +269,7 @@ p, li { white-space: pre-wrap; }
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform>Há <b>%n</b> objetos alterados</numerusform>
-            <numerusform>Há <b>%n</b> objetos alterados</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -279,7 +299,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -296,7 +316,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
@@ -385,6 +405,11 @@ API message is '%1'</source>
 A mensagem da API foi '%1'</translation>
     </message>
     <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="464"/>
+        <source>Uploading changes...</source>
+        <translation>Carregando mudanças....</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="490"/>
         <source>OPEN changeset</source>
         <translation>Abrir mudança definida</translation>
@@ -394,11 +419,6 @@ A mensagem da API foi '%1'</translation>
         <source>CLOSE changeset</source>
         <translation>Fechar mudança definida</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="464"/>
-        <source>Uploading changes...</source>
-        <translation>Carregando mudanças....</translation>
-    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -501,97 +521,97 @@ Baixe novamente o atributo problemático para resolver o conflito.</translation>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>Sem título</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Camada Suja</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Camada enviada</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Imagens de fundo</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation>Camada de desenho #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation>Filtrar camada #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>Exportação OSM</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Exportando OSM...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Documento</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -645,245 +665,234 @@ Baixe novamente o atributo problemático para resolver o conflito.</translation>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Falha ao baixar</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 baixados</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>erro</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Baixando não resolvido...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>Não baixado suficiente</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation>
-            <numerusform>Baixando de OSM (%n bytes)</numerusform>
-            <numerusform>Baixando de OSM (%n bytes)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation>
-            <numerusform>Baixando de OSM (%n kBytes)</numerusform>
-            <numerusform>Baixando de OSM (%n kBytes)</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Baixando não resolvido %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Baixando de OSM (conectando)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Analisando não resolvido %1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation>Código de status de http inesperado (%1)
-A mensagem do servidor foi '%2'</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Analizando...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation>
-A mensagem da API foi '%1'</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>Analizando XML</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Usuário/senha inválidos</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Conflitos de %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Conflitos não resolvidos</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Estradas/relações vazias detectadas</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Por favor, resolva primeiro os conflitos existentes</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Estradas/relações vazias são provavelmente erros.
+Você deseja marcá-las para exclusão?</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Remover característica vazia %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>Os conflitos têm sido detectados</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Baixando pontos</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation>Isso significa que alguns dos recursos que você modificou desde o seu último download já foram modificado por alguém no servidor.
+Os recursos têm sido duplicados como "conflito..." sobre a camada "Conflitos..".
+Antes de carregar as alterações, você terá que manualmente mesclar as duas versões e remover uma da camada "Conflitos...".</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>Analizando XML</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Enviando...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Baixando pontos de pista %1-%2</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Preparando mudanças</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Estrada baixada - nós %1-%2</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Esperando resposta do servidor</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 baixados</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>erro</translation>
     </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Baixando não resolvido %1 de %2</translation>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation><numerusform>Baixando de OSM (%n bytes)</numerusform><numerusform>Baixando de OSM (%n bytes)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation><numerusform>Baixando de OSM (%n kBytes)</numerusform><numerusform>Baixando de OSM (%n kBytes)</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Analisando não resolvido %1 de %2</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Baixando...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Conflitos de %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Baixando de OSM (conectando)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>Os conflitos têm sido detectados</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation>Código de status de http inesperado (%1)
+A mensagem do servidor foi '%2'</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation>Isso significa que alguns dos recursos que você modificou desde o seu último download já foram modificado por alguém no servidor.
-Os recursos têm sido duplicados como "conflito..." sobre a camada "Conflitos..".
-Antes de carregar as alterações, você terá que manualmente mesclar as duas versões e remover uma da camada "Conflitos...".</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation>
+A mensagem da API foi '%1'</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Estradas/relações vazias detectadas</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Falha ao baixar</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Estradas/relações vazias são provavelmente erros.
-Você deseja marcá-las para exclusão?</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Usuário/senha inválidos</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Remover característica vazia %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Conflitos não resolvidos</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Baixando %1,%2 (zoom %3)...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Por favor, resolva primeiro os conflitos existentes</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Baixando...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Baixando pontos de pista %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Analizando...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Estrada baixada - nós %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Baixando não resolvido...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Enviando...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Baixando pontos</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Preparando mudanças</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Esperando resposta do servidor</translation>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Baixando %1,%2 (zoom %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Fechar</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation>Impossível excluir</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
         <translation>Impossível excluir seleção porque está fora da área carregada.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
         <translation>Impossível excluir tudo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
         <translation>Nem toda a seleção pode ser excluída porque parte dela está fora da área carregada.
 Excluir apenas o possível?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
         <translation>Reverter caminho %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
         <translation>Reverter %1 caminhos</translation>
     </message>
@@ -939,6 +948,11 @@ Excluir apenas o possível?</translation>
         <translation>Download de crianças desaparecidas</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Adicionar para seleção</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Excluir</translation>
@@ -963,11 +977,6 @@ Excluir apenas o possível?</translation>
         <source>All</source>
         <translation>Todos</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Adicionar para seleção</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -1018,7 +1027,7 @@ Excluir apenas o possível?</translation>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -1074,271 +1083,245 @@ Excluir apenas o possível?</translation>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Tempo limite de rede esgotado</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Não foi possível ler os detalhes da foto no servidor do Walking Papers.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Por favor, especifique uma URL do Walking Papers válida</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>Endereço:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Geo imagens</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Centro do mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Remover imagens</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Copiar nome de arquivo para área de transferência</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
-        <source>Load geotagged Images</source>
-        <translation>Carregar imagens georeferenciadas</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Selecionar próxima imagem</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
-        <source>Select the layer to which the images belong:</source>
-        <translation>Selecionar a camada a que pertencem as imagens seguintes:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>PageDown</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation>Camada é somente-leitura</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Selecionar imagem anterior</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation>A camada utilizada não é gravável. Deseja torná-la gravável?
-Caso contrário, você não poderá carregar imagens pertencentes a ela.</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>PageUp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
-        <source>Loading Images ...</source>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Salvar imagem com geotags...</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Camada de fotos</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
+        <source>Load geotagged Images</source>
+        <translation>Carregar imagens georeferenciadas</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
+        <source>Select the layer to which the images belong:</source>
+        <translation>Selecionar a camada a que pertencem as imagens seguintes:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation>Camada é somente-leitura</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation>A camada utilizada não é gravável. Deseja torná-la gravável?
+Caso contrário, você não poderá carregar imagens pertencentes a ela.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
+        <source>Loading Images ...</source>
         <translation>Carregando imagens ...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Cancelar carregamento</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>Arquivo não existe</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>Não foi possível localizar imagem "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>Erro ao abrir "%2":
+%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Erro ao carregar dados EXIF a partir de "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation>Especificar distância</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation>Posição das imagnes mais para o:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>final da pista</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>início da pista</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Sem pontos de pista</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Pontos de pista não encontrados para a imagem "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'segundos'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'minutos e' ss 'segundos'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'horas,' mm 'minutos e' ss 'segundos'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>Imagen incorreta?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>A imagem "%1" foi obtida %2 antes do próximo ponto de pista que foi gravado.
 Desejas continuar a usá-lo?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>A imagem "%1" foi obtida %2 depois do último ponto de pista que foi gravado.
 Desejas continuar a usá-lo?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>Arquivo não existe</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Tempo limite de rede esgotado</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Não foi possível ler os detalhes da foto no servidor do Walking Papers.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Por favor, especifique uma URL do Walking Papers válida</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>Endereço:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Centro do mapa</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Salvar imagem com geotags...</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Camada de fotos</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>Não foi possível localizar imagem "%1".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>Erro ao abrir "%2":
-%1</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Sem pontos de pista</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Pontos de pista não encontrados para a imagem "%1"</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation>Especifique o nome do arquivo de saída</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>JPEG Images (*.jpg)</source>
         <translation>Imagens JPEG (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Erro ao carregar dados EXIF a partir de "%1".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation>Especifique o nome do arquivo de saída</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Erro ao abrir "%1":
 %2</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Selecionar próxima imagem</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>PageDown</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Selecionar imagem anterior</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>PageUp</translation>
-    </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>URL OSM inválida</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>A URL especificada não é válida!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Formato das coordenadas inválido</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Formato das coordenadas: '<left lon>, <botton lat>, <right lon>, <top lat>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Formato das coordenadas: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Ir para</translation>
@@ -1356,12 +1339,12 @@ Desejas continuar a usá-lo?</translation>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1394,51 +1377,77 @@ Desejas continuar a usá-lo?</translation>
         <source>Search</source>
         <translation>Pesquisar</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>URL OSM inválida</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>A URL especificada não é válida!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Formato das coordenadas inválido</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Formato das coordenadas: '<left lon>, <botton lat>, <right lon>, <top lat>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Formato das coordenadas: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Adaptador de forma</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
         <translation>Definir projeção atual à da camada</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>Adaptador WMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>Adaptador TMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>Complementos</translation>
     </message>
@@ -1446,73 +1455,73 @@ Desejas continuar a usá-lo?</translation>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Mapa - Nenhum</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Mapa - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Mapa - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Mapa - WMS-Tiled - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Mapa - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Mapa - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation>Termos da Licença: %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation>Termos da Licença não aceitos</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
         <translation>Você ainda não marcou a caixa de verificação expressando sua concordância com os termos de licenciamento.
 Como tal, você não será capaz de utilizar esta fonte como uma camada do mapa.
 É realmente o que você queria?</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Tamanho da imagem</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation>Ampliação mínima/máxima</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Projeção</translation>
     </message>
@@ -1520,158 +1529,59 @@ Como tal, você não será capaz de utilizar esta fonte como uma camada do mapa.
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Texto</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Inteiro</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
+        <source>Input</source>
+        <translation>Entrada</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Float</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Longitude</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
+        <source>OSM Preview</source>
+        <translation>Pré-visualização OSM</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Latitude</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
+        <source>Specifications</source>
+        <translation>Especificações</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Projeção inválida</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
+        <source>First line contains headers</source>
+        <translation>Primeira linha contem cabeçalhos</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Não foi possível definir projeção.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Sem coordenadas</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Faltando campo de Latitude ou Longitude. Será impossível importar o arquivo.
-Tem certeza de que deseja sair?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Carregar configurações de importação CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Configurações de importação do Merkaator (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Arquivo inválido</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 não pode ser aberto.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 não é um arquivo CSV de configuração de importação</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>Salvar opções de importação de CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>Sem título</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Todos os arquivos (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>Não foi possível salvar as opções de importação</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 não pode ser aberto para escrita.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
-        <source>Input</source>
-        <translation>Entrada</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
-        <source>OSM Preview</source>
-        <translation>Pré-visualização OSM</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
-        <source>Specifications</source>
-        <translation>Especificações</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
-        <source>First line contains headers</source>
-        <translation>Primeira linha contem cabeçalhos</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
-        <source>Delimiter</source>
-        <translation>Delimitador</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
+        <source>Delimiter</source>
+        <translation>Delimitador</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
@@ -1696,7 +1606,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1768,16 +1678,115 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Salvar configurações...</translation>
     </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Texto</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Inteiro</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Float</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Longitude</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Latitude</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Projeção inválida</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Não foi possível definir projeção.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Sem coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Faltando campo de Latitude ou Longitude. Será impossível importar o arquivo.
+Tem certeza de que deseja sair?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Carregar configurações de importação CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Configurações de importação do Merkaator (*.mis)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Arquivo inválido</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 não pode ser aberto.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 não é um arquivo CSV de configuração de importação</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>Salvar opções de importação de CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>Sem título</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Todos os arquivos (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>Não foi possível salvar as opções de importação</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 não pode ser aberto para escrita.</translation>
+    </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
         <translation>Incapaz de definir projeção; por favor especifique uma</translation>
     </message>
@@ -1793,21 +1802,18 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n característica</numerusform>
-            <numerusform>%n características</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Recursos</translation>
     </message>
@@ -1827,6 +1833,21 @@ p, li { white-space: pre-wrap; }
         <translation>Ocultar todas</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
+        <source>Readonly All</source>
+        <translation>Todas apenas leitura</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
+        <source>Readonly None</source>
+        <translation>Nenhuma apenas leitura</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="395"/>
         <source>Layers</source>
         <translation>Camadas</translation>
@@ -1847,90 +1868,75 @@ p, li { white-space: pre-wrap; }
         <translation>Desenhar</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation>Redefinir Camadas para o padrão</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
         <source>Tracks</source>
         <translation>Estradas</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
-        <source>Readonly All</source>
-        <translation>Todas apenas leitura</translation>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation>Redefinir Camadas para o padrão</translation>
     </message>
+</context>
+<context>
+    <name>LayerWidget</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="260"/>
-        <source>Readonly None</source>
-        <translation>Nenhuma apenas leitura</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="267"/>
-        <source>Close</source>
-        <translation>Fechar</translation>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
     </message>
-</context>
-<context>
-    <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation>Apenas leitura</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Opaco</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Opacidade</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
         <translation>Fechar Camada: Objetos alterados presentes.</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
         <translation>Há objetos alterados nesta camada.
 Tem certeza que deseja fechá-la? (impossível Desfazer)</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
         <translation>Fechar Camada: Não vazia</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
         <translation>Tem certeza que deseja fechar esta camada? (impossível Desfazer)</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
 </context>
 <context>
     <name>LicenseDisplayDialog</name>
@@ -1961,2797 +1967,2821 @@ Tem certeza que deseja fechá-la? (impossível Desfazer)</translation>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Carregando plugins...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Inicializando...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Apagar rótulo '%1' em %2</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Criar área %1</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>A&juda</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Área: Criar via %1</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Criar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Área: Concluir via %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>V&ia</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Área: Adicionar nó %1 a via %2</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Editar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>Fechar Área %1</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>E&xibir</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Marcadores</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Adicionar nós a via de duplo sentido %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Definir &projeção</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Criar via de duplo sentido %1</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Definirr &opacidade de áreas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Criar nó na via: %1</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Arquivo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Criar POI %1</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Exportar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Criar desvio %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Abrir re&cente</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Criar nó %1 na via %2</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Importar recen&te</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Criar via: %1</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>F&erramentas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Criar nó: %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>E&stilo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Adicionar nó %1 a via %2</translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation>Modelos de Eti&quetas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Encerrar Estrada %1</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Nó</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Encontrados vários nós na mesma posição.</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Janela</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Deseja unir todos os nós em um ponto de reunião?</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Barras</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Uni nós em %1</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Carac&terística</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>CLIQUE para selecionar/mover;CTRL-CLIQUE para alternar seleção;SHIFT-CLICK para adicionar à seleção;SHIFT-ARRASTO para seleção de área;CTRL-ARRASTO para ampliação;DUPLO-CLIQUE para criar um nodo;DUPLO-CLIQUE em um nodo para iniciar um caminho;</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Camadas</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Remover característica %1</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation>Remover objetos</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&ação</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>Também deseja excluir os nodos filhos?
-Note que nodos do OSM fora da área carregada serão mantidos.</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>M&ostrar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation>Reverter %1 caminhos</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Mostrar set&as direcionais</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>imagem %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Barra de ferramentas principal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Propriedades...</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Sair</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Baixo</translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>So&bre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Alto</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Abrir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Opaco</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Criar um novo documento e importar um arquivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>Arquivo</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Editar</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Zoom em &tudo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>Ver</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Zoom na &janela</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Setas de Direção</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Zoom na janela</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Camadas</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>&Diminuir zoom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Criar</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Característica</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>&Aumentar zoom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Nó</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Aumentar zoom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Direção</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relação</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Link curvo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Ferramentas</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Desfazer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation>Janelas</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Ajuda</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Refazer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Conteúdo inválido para a área de transferência</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation>Recortar Objetos</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Mover</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>A área de transferência não contem dados válidos.</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Alterações não salvas</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>O mapa atual contem alterações não salvas que serão perdidas quando se iniciar um novo.
-Deseja cancelar o início de um novo mapa ou continuar e descartar as alterações?</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importar um arquivo no documento atual</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Download</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Baixar dados de mapa para uma nova área</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Pontos da via</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Via %1</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Link</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Aviso de advertência de copyright</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Criar link</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Estás intentando importar un archivo KML. Ten en cuenta que:
-
- - No puedes importar a OSM un archivo KML creado por Google Earth. Aunque creas
-   que los nodos que has creado desde GE son tuyos, ¡no lo son!
-   Todavía hay trabajo derivado por parte de GE, y por lo tanto, no puede ser usado en OSM.
-
- - Si lo has descargado desde internet, hay posibilidades de que tenga copyright.
-   Tienes que estar absolutamente seguro de que usar esos datos en OSM está permitido por el autor, o
-   que los datos son de dominio público
-
-Si no estás seguro, deberías preguntar en las listas "legal" o "talk" de correo de openstreetmap.
-
-¿Estás absolutamente seguro de que este KML puede ser importado legalmente en OSM?</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Arquivo não é válido</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Selecionar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 não pode ser aberto.</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Enviar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Enviar alterações ao servidor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Versão antiga de Qt detectada</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Sua configuração utiliza Qt %1, que contém vários erros conhecidos em transferir dados para o OpenStreetMap levando ao código 401 como resposta do servidor. Tem certeza que deseja continuar (o que não é recomendado)?
-Para mais informações consulte http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>R&emover</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Enviar OSM</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Remover características selecionadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Parece que você não especificou o seu
-nome de usuário e senha do OpenStreetMap.
-Você deseja fazer isso agora?</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Delete</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Erro ao baixar</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Criar uma nova via</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>O mapa não pode ser baixado</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Erro baixando OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Criar um novo nó</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>Não foi possível baixar os OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>Inve&rter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Inverter direção da via</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Unir vias</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Ir para...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Dividir vias</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Interromper vias</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>Via de &duplo sentido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Simplifique Ruas</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Criar via de duplo sentido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Tempo limite de rede esgotado</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Não foi possível contactar com OpenStreetBugs.</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Criar desvio</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Erro ao fechar o bug</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Novo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Não foi possível eliminar o bug. A mensagem do servidor é:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Criar um novo documento</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Adicionar números de rua</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Dividir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>Número de segmentos a dividir</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Dividir via em estradas separadas (conectadas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation>Especifique o número de segmentos</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>Subdividir estrada em %1</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Unir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation>Alinhar Eixo</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Unir vias conectadas em uma única estrada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation>Especifique o número de eixos regulares aos quais alinhar (ex.: 4 para retangular)</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>tringular</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Separar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>retangular</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Separar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>pentagonal</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Separar vias conectadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>hexagonal</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>heptagonal</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&lação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>octogonal</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Criar relação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>Alinhar a %1 eixos</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Áreas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>Alinhar a %1 eixos regulares</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Criar uma nova área</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation>Incapaz de alinhar a eixos</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Editar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>Operação de alinhar a eixos falhou. Por favor ajuste alguma aresta e tente novamente.</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Salvar &como...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>Operação de alinhar a eixos falhou e não convergiu em uma solução.</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Carregar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>Via &curva</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Alinhar nós</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Preferências...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation>Espalhar nós</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Todas...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Separar nó %1</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Exportar todas as camadas visíveis para um arquivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Adicionar membro à relação</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Localizar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Remover membro da relação</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Localizar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Localizar e selecionar itens</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>Unir áreas</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Janela de exibição...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Dividir área</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Exportar as características da janela de exibição para um arquivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation>Área de Terraço em %1</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Adicionar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Criar relação %1</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Remover...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Salvar estilo de mapa</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Unir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Estilo de mapa Merkaartor (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Unir nó</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Carregar estilo de mapa</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Unir os nós selecionados (o primeiro permanecerá selecionado)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Formatos suportados</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Estilo de mapa do Merkaartor (*.mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Salvar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation>MapCSS stylesheet (*.css)</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Salvar para arquivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Salvar documento Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Baixar mais</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>Sem título</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Baixar mais dados de mapa para a área atual</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Arquivos de documentos Merkaartor (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Baixar a visualização atual para a camada baixada anterior</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Todos os arquivos (*)</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>Formato GPS Exchange (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Propriedades</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>Formato OpenStreetMap (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Ocultar/Mostrar a barra de propriedades</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>Formato de Mudanças do OpenStreetMap (*.osc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Formato Noni GPSPlot (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Ocultar/Mostrar a barra de camadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>Formato de registro NMEA GPS (*.nmea *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>Arquivo KML (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Informações</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Formato separado por vírgulas (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Ocultar/Mostrar a barra de informação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Imagens georeferenciadas (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>Arquivo de forma ESRI (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Alinhar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation>Linguagem de Marcação de Geografia (*.gml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Alinhar nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Alinhar os nós selecionados. Os dois primeiros selecionados dão o alinhamento.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Documento Merkaartor (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Rota</translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>E&spalhar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Carregar imagem</translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation>Espalhar nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Adicionar um nó de posição a imagem</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Alinhar e espalhar igualmente os nós selecionados</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Geoetiquetar imagem com esta posição</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Ocultar/Mostrar a barra de ações</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Mostrar áreas baixa&das</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation>Salvar modelo de documento do Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Copiar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Não foi possível abrir arquivo salvo</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Copiar as características selecionadas e os rótulos para a área de transferência</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 não pode ser aberto para escrita.</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Copiar os rótulos das características selecionadas para a área de transferência; se a característica é um ponto de via, copiar as coordenadas também.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation>Incapaz de abrir salvar modelo de documento</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Arquivo inválido</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Colar rótulos (&Substituir)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 não é um documento de Merkaartor válido.</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Colar (e substituir) os rótulos na área de transferência para o recurso selecionado.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Exportar OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>Arquivos OSM (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Colar rótulos (&Unir)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Exportar osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Colar rótulos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>Arquivos de mudanças OSM (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Colar rótulos da área de transferência (Unir com os rótulos existentes)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Exportar GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Unir os rótulos na área de transferência com os do recurso selecionado.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Arquivos GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exportar KML</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Selecionado...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Arquivos KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Colar recurso(s)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Colar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Colar características da área de transferência</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Colar as caracteristicas na área de transferência; se as caracteríssticas já estão no documento, substitua-as.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (inteiro)</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Adicionar marcador</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Especificar o nome do marcador.</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binário)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Nome de marcador inválido</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Forçar envio</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>O marcador não pode estar em branco.</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Confirmar característica para a camanda temporária</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Aviso: O nome do marcador já existe</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Confirmar a característica selecionada de uma camada não carregável (ex.: Pista ou Extracto) para a camada temporária, pronta para o envio</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Digite um novo, mantenha o mesmo para substituir ou cancelar.</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Remover marcador</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Selecionar o marcador para remover.</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Ativar/desativar barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>Erro de GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Ocultar/Mostrar a barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Não foi possível abrir a porta GPS.</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Ocultar todas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Abrir arquivo de registro NMEA</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Salvar modelos rotulados</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Mostrar todas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Modelos de rótulos Merkaartor (*.mat)</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>Camada de &imagem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Abrir modelos de rótulos</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Raster/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation>Alerta! Não foi possível carregar as traduções do Merkaartor para a linguagem "%1". Alternando para o padrão Inglês.</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Mostrar &nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>A&juda</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>&Mostrar nomes</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Criar</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>V&ia</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Iniciar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Editar</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Iniciar GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>E&xibir</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Reproduzir...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Marcadores</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Reproduzir GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Definir &projeção</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Mostrar set&as direcionais</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Ocultar/Mostrar a barra GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Definirr &opacidade de áreas</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Arquivo</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>P&arar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Exportar</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Parar GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Abrir re&cente</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centrar no GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Importar recen&te</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Mostrar &segmentos da via</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>F&erramentas</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>E&stilo</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Mostrar e&scala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Nó</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Janela</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Mostrar &relações</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Barras</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Carac&terística</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Mostrar vias do fundo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Mostrar vias de fronteira</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Camadas</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Mostrar retoque</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&ação</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Gravar GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>M&ostrar</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Sair</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Pausar GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>So&bre</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoImagem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Abrir</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Ocultar/Mostrar a barra de geoimagens</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Criar um novo documento e importar um arquivo</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Gerenciador OSB Wolrd...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Zoom em &tudo</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Editor de atalhos...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Unir...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Zoom na &janela</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Salvar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Zoom na janela</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Adicionar membro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Remover membro</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>&Diminuir zoom</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Nunca</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>para vias de mã&o única</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>&Aumentar zoom</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Sempre</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Aumentar zoom</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Separar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Separar nó de uma via</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Link curvo</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Separar um nó de uma via</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Desfazer</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Trabalhar desconectado</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Refazer</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>E&stilos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Ocultar/Mostrar a barra de estilos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Mover</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>Editor de Servidores &WMS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importar</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>Editor de Servidores &TMS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importar um arquivo no documento atual</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Reiniciar estado de dialogos descartables</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Download</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Menu GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Baixar dados de mapa para uma nova área</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Casa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Criar &junção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Link</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Girar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Criar link</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Selecionar</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Enviar</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Recursos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Enviar alterações ao servidor</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Adicionar &número de rua (esquema Karlsruhe)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Subdividir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>R&emover</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation>Subdiidir segmento igualmente</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Remover características selecionadas</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation>Subdividir um segmento de caminho selecionado (um caminho e dois nós adjacentes) em segmentos de igual tamanho.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Delete</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Exibir nós &virtuais</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Criar uma nova via</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Exibir &grade de lat/lon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>&Travar zoom para o fundo de quadros</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Criar um novo nó</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>Editor de &Projeções</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>Exibir &Fotos no mapa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>Inve&rter</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Inverter direção da via</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Forçar apagar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Ir para...</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>Via de &duplo sentido</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>Simplifique</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Criar via de duplo sentido</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Simplifique rua(s)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Criar desvio</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>Simplifique a trilha através da remoção desnecessária nós filho</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Novo</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>Editor de &Filtros</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Criar um novo documento</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>&Nenhum</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Dividir</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation>&Unir  Áreas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Dividir via em estradas separadas (conectadas)</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation>Unir áreas em contato</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation>Unir áreas em contato.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Unir</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>&Dividir Área</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Unir vias conectadas em uma única estrada</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation>Dividir área entre dois nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation>Dividir uma área selecionada entre dois nodos selecionados em duas áreas separadas.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Separar</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>&Terraço</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Separar</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation>Área de Terraço em Residências</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Separar vias conectadas</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation>Dividir uma área selecionada em residências geminadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation>Editor de Barra de Ferramentas...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&lação</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Criar relação</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation>Alinhar bordas a eixos regulares</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Áreas</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation>Alinhar bordas a um certo número de eixos regularmente espaçados.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Criar uma nova área</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>&Imprimir...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Editar...</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation>Prévia de impressão...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Salvar...</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Propriedades...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Carregar...</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>Via &curva</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Preferências...</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Todas...</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Exportar todas as camadas visíveis para um arquivo</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation>E&xtrudir</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Localizar...</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation>Extrudir interação para caminhos (estilo JOSM)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Localizar</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Localizar e selecionar itens</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation>Selecionar alternação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Janela de exibição...</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation>Incluir filhos na seleção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Exportar as características da janela de exibição para um arquivo</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>Redimensionar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Adicionar...</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation>Salvar como Modelo de Documento...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Remover...</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Unir</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Unir nó</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Unir os nós selecionados (o primeiro permanecerá selecionado)</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Salvar &como...</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Salvar</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Salvar para arquivo</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Baixar mais</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Download de crianças desaparecidas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Baixar mais dados de mapa para a área atual</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Baixar a visualização atual para a camada baixada anterior</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Apagar rótulo '%1' em %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Propriedades</translation>
-    </message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Limpar %1 etiquetas em %2</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Ocultar/Mostrar a barra de propriedades</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation>Definir rótulo "source" em %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Remover membro '%1' em %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Ocultar/Mostrar a barra de camadas</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Reordenar membros na relação %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Relação modificada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informações</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Criar interação em nó</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Ocultar/Mostrar a barra de informação</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Criar nó na via: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Criar área de interação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Alinhar</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Criar área %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Alinhar nós</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Área: Criar via %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Alinhar os nós selecionados. Os dois primeiros selecionados dão o alinhamento.</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Adicionar um buraco.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Você deseja adicionar um (outro) buraco a esta área?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>E&spalhar</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Área: Concluir via %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation>Espalhar nós</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Área: Adicionar nó %1 a via %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Alinhar e espalhar igualmente os nós selecionados</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Fechar Área %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Ocultar/Mostrar a barra de ações</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Adicionar nós a via de duplo sentido %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Mostrar áreas baixa&das</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Criar via de duplo sentido %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Criar POI %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Copiar</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>CLICK IZQUIERDO para inciar;ARRASTRAR para escalar;SHIFT+ARRASTRE para rotar;CLICK IZQUIERDO para terminar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Copiar as características selecionadas e os rótulos para a área de transferência</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Criar interação em polígono</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Copiar os rótulos das características selecionadas para a área de transferência; se a característica é um ponto de via, copiar as coordenadas também.</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Criar polígono %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Criar interação em desvio</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Colar rótulos (&Substituir)</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Criar desvio %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Colar (e substituir) os rótulos na área de transferência para o recurso selecionado.</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Criar interação em via</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Criar nó %1 na via %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Colar rótulos (&Unir)</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Criar via: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Colar rótulos</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Criar nó: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Colar rótulos da área de transferência (Unir com os rótulos existentes)</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Adicionar nó %1 a via %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Unir os rótulos na área de transferência com os do recurso selecionado.</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Encerrar Estrada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Selecionado...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>CLIQUE para selecionar/mover;CTRL-CLIQUE para alternar seleção;SHIFT-CLICK para adicionar à seleção;SHIFT-ARRASTO para seleção de área;CTRL-ARRASTO para ampliação;DUPLO-CLIQUE para criar um nodo;DUPLO-CLIQUE em um nodo para iniciar um caminho;</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Editar interação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Remover característica %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>Remover objetos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Excluir filhos.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation>Dividir uma área selecionada entre dois nodos selecionados em duas áreas separadas.</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>Também deseja excluir os nodos filhos?
+Note que nodos do OSM fora da área carregada serão mantidos.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>Reverter %1 caminhos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation>Alinhar bordas a eixos regulares</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation>Aplicar Extrusão na Estrada %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation>Alinhar bordas a um certo número de eixos regularmente espaçados.</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>CLIQUE para selecionar;CLIQUE+ARRASTE para mover</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>&Imprimir...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Mover nó de interação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation>Prévia de impressão...</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Mover nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Mover nó %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Encontrados vários nós na mesma posição.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Deseja unir todos os nós em um ponto de reunião?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Uni nós em %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation>APONTE para selecionar;ARRASTO-ESQUERDO para rotacionar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Girar interação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation>Rotacionar Objeto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation>APONTE para selecionar;ARRASTO-ESQUERDO para redimensionar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation>Redimensionar Interação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation>Redimensionar Objeto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>Click-izquierdo a la primera esquina -> Arrastre-izquierdo al area especifica ->Click izquierdo para ampliar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Interação do zoom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Download de crianças desaparecidas</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>Formato GPS Exchange (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>Formato OpenStreetMap (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>Formato de Mudanças do OpenStreetMap (*.osc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation>E&xtrudir</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Formato Noni GPSPlot (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation>Extrudir interação para caminhos (estilo JOSM)</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>Formato de registro NMEA GPS (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation>Alt+X</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>Arquivo KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation>Selecionar alternação</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Formato separado por vírgulas (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation>Incluir filhos na seleção</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Imagens georeferenciadas (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>Redimensionar</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>Arquivo de forma ESRI (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation>Salvar como Modelo de Documento...</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation>Linguagem de Marcação de Geografia (*.gml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Colar</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Colar características da área de transferência</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Formatos suportados</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Colar as caracteristicas na área de transferência; se as caracteríssticas já estão no documento, substitua-as.</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Documento Merkaartor (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Todos os arquivos (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>imagem %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binário)</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Não foi possível carregar arquivo de projeções</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Confirmar característica para a camanda temporária</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projections.xml" não pode ser aberto em qualquer lugar. Cancelando.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Confirmar a característica selecionada de uma camada não carregável (ex.: Pista ou Extracto) para a camada temporária, pronta para o envio</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Baixo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Opaco</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Ativar/desativar barra de ferramentas</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Característica</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Ocultar/Mostrar a barra de ferramentas</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Nó</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Ocultar todas</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Rota</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Mostrar todas</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Carregar imagem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>Camada de &imagem</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Adicionar um nó de posição a imagem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>Editor de Servidores &WMS</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Geoetiquetar imagem com esta posição</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>Editor de Servidores &TMS</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Subdividir</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>Arquivo</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation>Subdiidir segmento igualmente</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation>Subdividir um segmento de caminho selecionado (um caminho e dois nós adjacentes) em segmentos de igual tamanho.</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>Simplifique</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Simplifique rua(s)</translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Setas de Direção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Simplifique a trilha através da remoção desnecessária nós filho</translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>Editor de &Filtros</translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Camadas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>&Nenhum</translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Criar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation>&Unir  Áreas</translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Direção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation>Unir áreas em contato</translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Ferramentas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation>Unir áreas em contato.</translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation>Janelas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>&Dividir Área</translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation>Dividir área entre dois nós</translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation>Recortar Objetos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>&Terraço</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Conteúdo inválido para a área de transferência</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation>Área de Terraço em Residências</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>A área de transferência não contem dados válidos.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation>Dividir uma área selecionada em residências geminadas</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation>Editor de Barra de Ferramentas...</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Alterações não salvas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Raster/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>O mapa atual contem alterações não salvas que serão perdidas quando se iniciar um novo.
+Deseja cancelar o início de um novo mapa ou continuar e descartar as alterações?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation>Modelos de Eti&quetas</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>Barra de ferramentas principal</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Pontos da via</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Via %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Iniciar</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Aviso de advertência de copyright</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Iniciar GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Estás intentando importar un archivo KML. Ten en cuenta que:
+
+ - No puedes importar a OSM un archivo KML creado por Google Earth. Aunque creas
+   que los nodos que has creado desde GE son tuyos, ¡no lo son!
+   Todavía hay trabajo derivado por parte de GE, y por lo tanto, no puede ser usado en OSM.
+
+ - Si lo has descargado desde internet, hay posibilidades de que tenga copyright.
+   Tienes que estar absolutamente seguro de que usar esos datos en OSM está permitido por el autor, o
+   que los datos son de dominio público
+
+Si no estás seguro, deberías preguntar en las listas "legal" o "talk" de correo de openstreetmap.
+
+¿Estás absolutamente seguro de que este KML puede ser importado legalmente en OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Reproduzir...</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Arquivo não é válido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Reproduzir GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 não pode ser aberto.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Ocultar/Mostrar a barra GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>P&arar</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Parar GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Abrir arquivos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centrar no GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Versão antiga de Qt detectada</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Mostrar &segmentos da via</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Sua configuração utiliza Qt %1, que contém vários erros conhecidos em transferir dados para o OpenStreetMap levando ao código 401 como resposta do servidor. Tem certeza que deseja continuar (o que não é recomendado)?
+Para mais informações consulte http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Enviar OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Mostrar e&scala</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Parece que você não especificou o seu
+nome de usuário e senha do OpenStreetMap.
+Você deseja fazer isso agora?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Erro ao baixar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Mostrar &relações</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>O mapa não pode ser baixado</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Erro baixando OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Mostrar vias do fundo</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>Não foi possível baixar os OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Mostrar vias de fronteira</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Mostrar retoque</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Gravar</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Criar polígono</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Gravar GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Especificar o número de lados</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pausar</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Unir vias</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Pausar GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Dividir vias</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eoImagem</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Interromper vias</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Ocultar/Mostrar a barra de geoimagens</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Simplifique Ruas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Forçar envio do recurso</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Gerenciador OSB Wolrd...</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Tempo limite de rede esgotado</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Editor de atalhos...</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Não foi possível contactar com OpenStreetBugs.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Unir...</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Erro ao fechar o bug</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Adicionar membro</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Não foi possível eliminar o bug. A mensagem do servidor é:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Remover membro</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Criar junção</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nunca</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Cruzamentos múltiplos.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>para vias de mã&o única</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Essas vias têm cruzamentos múltiplos.
+Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados podem ainda serem excluídos depois da mão)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Sempre</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Adicionar números de rua</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Separar</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>Número de segmentos a dividir</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation>Especifique o número de segmentos</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>Subdividir estrada em %1</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation>Alinhar Eixo</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation>Especifique o número de eixos regulares aos quais alinhar (ex.: 4 para retangular)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Separar nó de uma via</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>tringular</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Separar um nó de uma via</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>retangular</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Trabalhar desconectado</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>pentagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>hexagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>E&stilos</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>heptagonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Ocultar/Mostrar a barra de estilos</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>octogonal</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Adicionar &número de rua (esquema Karlsruhe)</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>Alinhar a %1 eixos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Exibir nós &virtuais</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>Alinhar a %1 eixos regulares</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>Exibir &grade de lat/lon</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation>Incapaz de alinhar a eixos</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>&Travar zoom para o fundo de quadros</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>Operação de alinhar a eixos falhou. Por favor ajuste alguma aresta e tente novamente.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>Editor de &Projeções</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>Operação de alinhar a eixos falhou e não convergiu em uma solução.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>Exibir &Fotos no mapa</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Alinhar nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Forçar apagar</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation>Espalhar nós</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Fechar</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Separar nó %1</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Relação modificada %1</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Adicionar membro à relação</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Remover membro '%1' em %2</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Remover membro da relação</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>Conflitos não resolvidos</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Por favor, resolva primeiro os conflitos existentes</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Unir áreas</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Se recomienda encarecidamente guardar los cambios en el documento tras una carga.
-¿Desea hacerlo ahora?</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Dividir área</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Definir rótulos em %1</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation>Área de Terraço em %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Adicionar um buraco.</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Criar relação %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Você deseja adicionar um (outro) buraco a esta área?</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Salvar estilo de mapa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Não foi possível carregar arquivo de projeções</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Estilo de mapa Merkaartor (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>"Projections.xml" não pode ser aberto em qualquer lugar. Cancelando.</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Carregar estilo de mapa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Abrir arquivos</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Estilo de mapa do Merkaartor (*.mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Criar junção</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation>MapCSS stylesheet (*.css)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Projeção inválida</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Não foi possível definir projeção "%1".</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>Sem título</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Reiniciar estado de dialogos descartables</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Salvar documento Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Menu GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Arquivos de documentos Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Casa</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation>Salvar modelo de documento do Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Criar &junção</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Não foi possível abrir arquivo salvo</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Excluir filhos.</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 não pode ser aberto para escrita.</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Definir rótulos em múltiplas funções</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation>Incapaz de abrir salvar modelo de documento</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Criar área de interação</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Arquivo inválido</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Criar interação em nó</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 não é um documento de Merkaartor válido.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>CLICK IZQUIERDO para inciar;ARRASTRAR para escalar;SHIFT+ARRASTRE para rotar;CLICK IZQUIERDO para terminar</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Exportar OSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Criar interação em polígono</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>Arquivos OSM (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Criar polígono %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Exportar osmChange</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Criar interação em desvio</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>Arquivos de mudanças OSM (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Criar interação em via</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Exportar GPX</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Editar interação</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Arquivos GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Mover nós</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Exportar KML</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Mover nó %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Arquivos KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>CLIQUE para selecionar;CLIQUE+ARRASTE para mover</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Mover nó de interação</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation>APONTE para selecionar;ARRASTO-ESQUERDO para rotacionar</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Girar interação</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (inteiro)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation>Rotacionar Objeto</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Adicionar marcador</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>Click-izquierdo a la primera esquina -> Arrastre-izquierdo al area especifica ->Click izquierdo para ampliar</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Especificar o nome do marcador.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Interação do zoom</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Nome de marcador inválido</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Criar polígono</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>O marcador não pode estar em branco.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Especificar o número de lados</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Aviso: O nome do marcador já existe</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Forçar envio do recurso</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Digite um novo, mantenha o mesmo para substituir ou cancelar.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Forçar envio</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Remover marcador</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>Mostrar &nós</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Selecionar o marcador para remover.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>&Mostrar nomes</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Projeção inválida</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Girar</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Não foi possível definir projeção "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>Erro de GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Cruzamentos múltiplos.</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Não foi possível abrir a porta GPS.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Essas vias têm cruzamentos múltiplos.
-Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados podem ainda serem excluídos depois da mão)?</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Abrir arquivo de registro NMEA</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Colar recurso(s)</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Salvar modelos rotulados</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Recursos</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Modelos de rótulos Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Limpar %1 etiquetas em %2</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Abrir modelos de rótulos</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Reordenar membros na relação %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation>Alerta! Não foi possível carregar as traduções do Merkaartor para a linguagem "%1". Alternando para o padrão Inglês.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation>Aplicar Extrusão na Estrada %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Conflitos não resolvidos</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation>APONTE para selecionar;ARRASTO-ESQUERDO para redimensionar</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Por favor, resolva primeiro os conflitos existentes</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation>Redimensionar Interação</translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Se recomienda encarecidamente guardar los cambios en el documento tras una carga.
+¿Desea hacerlo ahora?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation>Redimensionar Objeto</translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Definir rótulos em múltiplas funções</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation>Definir rótulo "source" em %1</translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Definir rótulos em %1</translation>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>Último: </i><b>%1</b> by <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation><i>Último: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
         <translation><br/><i>Camada: </i><b>%1</b> </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Ponto da tota</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>coordenada</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>descrição</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>comentérios</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Nó</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>elevação</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>velocidade</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>tamanho</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>membros</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>No topo à esquerda</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>Abaixo à direita</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Relação</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Função</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Membro</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
         <translation>Caminho fechado</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Comprimento</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>nós %1</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Direção</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>Área</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>coordenada</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>elevação</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>velocidade</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Ponto da tota</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Direção</translation>
     </message>
+</context>
+<context>
+    <name>MapView</name>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>descrição</translation>
+        <location filename="../src/common/MapView.cpp" line="339"/>
+        <source>%1 m/pixel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>comentérios</translation>
+        <location filename="../src/common/MapView.cpp" line="345"/>
+        <source>Align: %1m @ %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Nó</translation>
+        <location filename="../src/common/MapView.cpp" line="351"/>
+        <source>%1ms</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapView</name>
     <message>
         <location filename="../src/common/MapView.cpp" line="384"/>
         <source>%1 m</source>
@@ -4763,32 +4793,17 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="339"/>
-        <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="345"/>
-        <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="351"/>
-        <source>%1ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
         <translation>Caixa Delimitadora</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Projeção</translation>
     </message>
@@ -4796,34 +4811,44 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Novo servidor</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Novo marcador</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Falha ao carregar preferências</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Chave duplicada</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Mais de 150 preferências</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Novo marcador</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Novo servidor</translation>
     </message>
 </context>
 <context>
@@ -4852,17 +4877,17 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Classe</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Campo desconhecido</translation>
     </message>
@@ -4875,25 +4900,10 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
         <translation>Erro!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Servidor não encontrado pelo serviço de busca.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Conexão recusada pelo servidor de serviço de busca.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>O servidor do serviço de busca requer autenticação.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Erro desconhecido.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4914,11 +4924,6 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation>Arquivos PDF (*.pdf)</translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4926,6 +4931,11 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation>Arquivos PDF (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -5037,25 +5047,6 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Sempre</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Selecionar cor</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Editor de estilo de mapa</translation>
@@ -5072,20 +5063,45 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
         <translation>Fundo</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="96"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="273"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="289"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="340"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="486"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="681"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="791"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="997"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1289"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1363"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1608"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="96"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="273"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="289"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="340"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="486"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="681"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="791"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="997"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1289"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1363"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1608"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Espessura proporcional</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>Espessura fixa</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
@@ -5136,31 +5152,6 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
         <translation>Desenhar com cores</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Espessura proporcional</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>Espessura fixa</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5180,7 +5171,7 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5190,12 +5181,12 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5215,7 +5206,7 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5252,284 +5243,113 @@ Você ainda deseja criar uma junção para cada uma (cruzamentos indesejados pod
         <source>Label with background tag</source>
         <translation>Etiquetar com a marca de fundo</translation>
     </message>
-</context>
-<context>
-    <name>PhotoLoadErrorDialog</name>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
-        <source>No Valid geotag</source>
-        <translation>Sem Geoetiqueta Válida</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
-        <source>This photo does not contain geo-tagging EXIF data.
-What do you want to do next?</source>
-        <translation>Esta foto não possui dados EXIF de geo-tagging.
-O que você deseja fazer agora?</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
-        <source>Try to match with a track node</source>
-        <translation>Tentar alinhar com nó de trilha</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
-        <source>Load without associated node</source>
-        <translation>Carregar sem nós associado</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
-        <source>Extract info from barcode (Walking Papers)</source>
-        <translation>Extrair informações do barcode (Walking Papers)</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
-        <source>Ignore it</source>
-        <translation>Ignorar</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
-        <source>Do this for all current photos.</source>
-        <translation>Aplicar em todas as fotos atuais.</translation>
-    </message>
-</context>
-<context>
-    <name>PictureViewerDialog</name>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Output filename</source>
-        <translation>Nome do arquivo de saída</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>Arquivos SVG (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>untitled</source>
-        <translation>Sem título</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Todos os arquivos (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation>Arquivos de imagens (*.png *.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>Inglês</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Árabe</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Tcheco</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Holandês</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>Alemão</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>Francês</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation>Húngaro</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Italiano</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation>Japonês</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation>Polonês</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Português</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Português brasileiro</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Russo</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Eslovaco</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Espanhol</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Sueco</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>Ucraniano</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Diretório de estilos personalizados</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Marcar modelo</translation>
-    </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartor tag template (*.mat)</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Sempre</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
         <source>Select Color</source>
         <translation>Selecionar cor</translation>
     </message>
+</context>
+<context>
+    <name>PhotoLoadErrorDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>A ferramenta já existe</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
+        <source>No Valid geotag</source>
+        <translation>Sem Geoetiqueta Válida</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Ya existe una herramienta con este nombre.
-Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modificar el existente</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Não foi possível excluir ferramenta predefinida</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
+        <source>This photo does not contain geo-tagging EXIF data.
+What do you want to do next?</source>
+        <translation>Esta foto não possui dados EXIF de geo-tagging.
+O que você deseja fazer agora?</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Não foi possível excluir ferramenta predefinida "%1"</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
+        <source>Try to match with a track node</source>
+        <translation>Tentar alinhar com nó de trilha</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Não foi possível modificar o nome da ferramenta predefinida</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
+        <source>Load without associated node</source>
+        <translation>Carregar sem nós associado</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Não foi possível modificar o nome da ferramenta predefinida "%1"</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
+        <source>Extract info from barcode (Walking Papers)</source>
+        <translation>Extrair informações do barcode (Walking Papers)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Selecionar o executável da ferramenta</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
+        <source>Ignore it</source>
+        <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation>Selecionar modelo de documento</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
+        <source>Do this for all current photos.</source>
+        <translation>Aplicar em todas as fotos atuais.</translation>
     </message>
+</context>
+<context>
+    <name>PictureViewerDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation>Documento do Merkaartor (*.mdc)</translation>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Selecionar o diretório de registros (log)</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Output filename</source>
+        <translation>Nome do arquivo de saída</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
-        <source>Preferences</source>
-        <translation>Preferências</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>untitled</source>
+        <translation>Sem título</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Local</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>Arquivos SVG (*.svg)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Você pode precisar reiniciar o programa para que essas alterações entrem em vigor</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>Todos os arquivos (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Utilizar idioma</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation>Arquivos de imagens (*.png *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Traduzir as etiquetas padrão</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
+        <source>Preferences</source>
+        <translation>Preferências</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
@@ -5552,11 +5372,6 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Opacidade baixa/alta</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Modo mover separadamente</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
         <translation>Única interação do botão do mouse</translation>
@@ -5567,6 +5382,26 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Utilizar estilo Qt personalizado</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation>Permitir criação de nodo/caminho em modo de seleção</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Modo mover separadamente</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Usar nós virtuais (requer nova sessão)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Relações selecionáveis quando ocultas</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
         <source>Colors</source>
         <translation>Cores</translation>
@@ -5598,9 +5433,9 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Sobrescrever estilo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Pairar</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>Pista GPX</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5613,9 +5448,19 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Pixels</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Foco</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Utilizar aparência simples de pista GPX</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Interface</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Pairar</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
@@ -5623,19 +5468,89 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Relações</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Usar nós virtuais (requer nova sessão)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Foco</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Relações selecionáveis quando ocultas</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Destacar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Interface</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation>Alterado</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Você pode precisar reiniciar o programa para que essas alterações entrem em vigor</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Utilizar idioma</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Traduzir as etiquetas padrão</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
+        <source>Rendering</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
+        <source>Options</source>
+        <translation>Opções</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
+        <source>Use Anti-aliasing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
+        <source>Disable Anti-alisaing while panning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
+        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
+        <source>Use current style for wireframe rendering</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
+        <source>Editing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
+        <source>Quick editing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
+        <source>Wireframe editing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
+        <source>Full render editing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
@@ -5643,6 +5558,12 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Estilo de mapa</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Diretório de estilos personalizados</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
         <source>Current style</source>
         <translation>Estilo atual</translation>
@@ -5658,6 +5579,12 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Modelo</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Marcar modelo</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
         <source>Built-in</source>
         <translation>Predefinidos</translation>
@@ -5673,14 +5600,25 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Dados</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation>Carregar modelo de documento automaticamente</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
+        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
+        <translation>API do OSM (URL, ex.: "http://www.openstreetmap.org/api/0.6"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Senha:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
+        <source>XAPI</source>
+        <translation>XAPI</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
+        <source>URL:</source>
+        <translation>Endereço:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
+        <source>Nominatim (Geo Search)</source>
+        <translation>Nominatim (geobusca)</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
@@ -5688,6 +5626,11 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Documentos</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation>Carregar modelo de documento automaticamente</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
         <source>Autosave documents after upload</source>
         <translation>Salvar documentos automaticamente depois de carregá-los</translation>
@@ -5713,11 +5656,47 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Não conectar os nós GPX separados por mais de (em km; 0 para desabilitar)</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>Entrada de GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Serial</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Porta</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Host</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
         <translation>Salvar registro NMEA</translation>
@@ -5743,9 +5722,14 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Utilizar proxy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Servidor:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Senha:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Usuário:</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
@@ -5753,211 +5737,231 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Porta:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation>Permitir criação de nodo/caminho em modo de seleção</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Servidor:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation>Alterado</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
-        <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation>Habilitar servidor local compatível com o JOSM na porta 8111</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
-        <source>Options</source>
-        <translation>Opções</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation>Imagem de fundo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
-        <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation>Cache das imagens (não ative para o Yahoo! devido a restrições legais)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
-        <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation>Diretório de cache</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
-        <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation>Tamanho do cache (em Mb; 0 para desabilitar)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
-        <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation>Adaptador de mapa</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
-        <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
+        <source>Automatically add "source" tag when creating features over a background map</source>
+        <translation>Adicionar automaticamente o rótulo "source" ao criar objetos sobre um mapa de fundo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
-        <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
+        <source>Tools</source>
+        <translation>Ferramentas</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
-        <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
+        <source>Name:</source>
+        <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
-        <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
+        <source>Path:</source>
+        <translation>Caminho:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
-        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation>API do OSM (URL, ex.: "http://www.openstreetmap.org/api/0.6"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
+        <source>Apply</source>
+        <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
-        <source>XAPI</source>
-        <translation>XAPI</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
+        <source>Add</source>
+        <translation>Adicionar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
-        <source>URL:</source>
-        <translation>Endereço:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
+        <source>Remove</source>
+        <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
-        <source>Nominatim (Geo Search)</source>
-        <translation>Nominatim (geobusca)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>Inglês</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Árabe</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>Entrada de GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Tcheco</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Holandês</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Serial</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>Alemão</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Porta</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>Francês</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Host</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation>Húngaro</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>Habilitar servidor local compatível com o JOSM na porta 8111</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation>Japonês</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Imagem de fundo</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation>Polonês</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Cache das imagens (não ative para o Yahoo! devido a restrições legais)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Português</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
-        <translation>Diretório de cache</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>Português brasileiro</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Tamanho do cache (em Mb; 0 para desabilitar)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Russo</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
-        <translation>Adaptador de mapa</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Eslovaco</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
-        <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation>Adicionar automaticamente o rótulo "source" ao criar objetos sobre um mapa de fundo</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Espanhol</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
-        <source>Tools</source>
-        <translation>Ferramentas</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Sueco</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1518"/>
-        <source>Name:</source>
-        <translation>Nome:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>Ucraniano</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1528"/>
-        <source>Path:</source>
-        <translation>Caminho:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartor tag template (*.mat)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Selecionar cor</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>A ferramenta já existe</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Ya existe una herramienta con este nombre.
+Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modificar el existente</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Não foi possível excluir ferramenta predefinida</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1577"/>
-        <source>Apply</source>
-        <translation>Aplicar</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Não foi possível excluir ferramenta predefinida "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1584"/>
-        <source>Add</source>
-        <translation>Adicionar</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Não foi possível modificar o nome da ferramenta predefinida</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1591"/>
-        <source>Remove</source>
-        <translation>Remover</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Não foi possível modificar o nome da ferramenta predefinida "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Usuário:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Selecionar o executável da ferramenta</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Destacar</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation>Selecionar modelo de documento</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>Pista GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation>Documento do Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Utilizar aparência simples de pista GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Selecionar o diretório de registros (log)</translation>
     </message>
 </context>
 <context>
@@ -6010,7 +6014,7 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6046,25 +6050,25 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6142,29 +6146,6 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation>Exportanto GPX...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation>Importando...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Limpeza em cascata</translation>
@@ -6190,7 +6171,30 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Mover nó %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation>Exportanto GPX...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation>Importando...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Importar osmChange</translation>
     </message>
@@ -6200,31 +6204,31 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Importar NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importar NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6240,14 +6244,14 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6277,7 +6281,7 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6288,12 +6292,12 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Erro de registro GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Não é possível criar arquivo de registro do GPS: %1.</translation>
     </message>
@@ -6301,17 +6305,17 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>Não é possível conectar-se a %1:%2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Erro de registro GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Não é possível criar arquivo de registro do GPS: %1.</translation>
     </message>
@@ -6397,95 +6401,139 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< S E P A R A D O R ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>Personalizar Barras de Ferramentas</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Ações</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation>Barras de ferramentas</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Renomear</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation>Restaurar Tudo</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>Acima</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation>Abaixo</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
         <translation>Ações Atuais da Barra de Ferramentas</translation>
     </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< S E P A R A D O R ></translation>
+    </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation>Barra de Ferramentas Personalizada</translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6523,7 +6571,7 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
@@ -6561,7 +6609,7 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
@@ -6610,6 +6658,11 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <translation>Nome</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Identificador</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
         <translation>Consulta</translation>
@@ -6619,11 +6672,6 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <source>Maximum returned results (0 for all)</source>
         <translation>Máximo de resultados a obter (0 para todos)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Identificador</translation>
-    </message>
 </context>
 <context>
     <name>SlippyMapWidget</name>
@@ -6636,12 +6684,12 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -6665,6 +6713,16 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>Enviar para Openstreetmap</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation>Por favor, especifique um comentário para estas alterações definidas.</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>Por favor, reveja cuidadosamente as alterações enviadas para OSM</translation>
@@ -6679,16 +6737,6 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Enviar para Openstreetmap</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Por favor, especifique um comentário para estas alterações definidas.</translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
@@ -6732,7 +6780,7 @@ Por favor elija otro nombre o haga clic <Aplicar> buton si quiere modifica
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6746,6 +6794,21 @@ p, li { white-space: pre-wrap; }
         <translation>Projeção:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Lat/Lon (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>Origem está abaixo-esquerda</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
         <translation>Tamanho do ladrilho:</translation>
@@ -6771,21 +6834,6 @@ p, li { white-space: pre-wrap; }
         <translation>URL da Licença:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Lat/Lon (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>Origem está abaixo-esquerda</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
@@ -6801,24 +6849,18 @@ p, li { white-space: pre-wrap; }
         <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: GetServices</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Endereço e Rota não podem estra em branco.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Falha ao baixar: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Erro lendo serviços.
@@ -6958,55 +7000,55 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Extrair - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation># de segmentos do traçado</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Distância total</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Duração total</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1h %2m</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Extrair - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Extrair camada de desenho</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -7051,7 +7093,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
@@ -7105,12 +7147,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
@@ -7118,35 +7160,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: Tenha capacidades</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Endereço e Rota não podem estra em branco.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Falha ao baixar: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation>Sem Nome</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Erro ao ler capacidades.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>Configurar servidores WMS</translation>
@@ -7167,31 +7180,26 @@ p, li { white-space: pre-wrap; }
         <translation>Nome:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>URL do servidor:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>Camadas:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>Projeção:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>Formato da imagem:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Estilos:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -7200,6 +7208,11 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Este é um servidor de cache WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;&quot [...]
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>Projeção:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
         <translation>Azulejar</translation>
@@ -7210,6 +7223,16 @@ p, li { white-space: pre-wrap; }
         <translation>Níveis de Zoom</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation>Formato da imagem:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Estilos:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
         <translation>Valor do rótulo "source":</translation>
@@ -7235,14 +7258,33 @@ p, li { white-space: pre-wrap; }
         <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>URL do servidor:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: Tenha capacidades</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Endereço e Rota não podem estra em branco.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Erro ao ler capacidades.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Falha ao baixar: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation>Sem Nome</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_ru.ts b/translations/merkaartor_ru.ts
index 2c51e0c..a8d4ba5 100644
--- a/translations/merkaartor_ru.ts
+++ b/translations/merkaartor_ru.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -9,47 +7,14 @@
         <translation>О программе Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Эта программа распространяется под лицензией GNU Public License v2</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
-        <source>OK</source>
-        <translation>ОК</translation>
-    </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
-    </message>
-    <message>
         <location filename="../src/common/AboutDialog.ui" line="30"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Версия Merkaartor</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -67,7 +32,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -80,7 +45,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Версия PROJ4</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -93,106 +58,164 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Версия GDAL</span><br /><span style=" font-weight:600;">%1</span></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Авторское право Bart Vanhauwaert, Chris Browet и другие, 2006-2012</translation>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Эта программа распространяется под лицензией GNU General Public License v2</translation>
+    </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Журнал изменений</translation>
     </message>
+    <message>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
 </context>
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Комбинации клавиш</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&ОК</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Редактор комбинаций клавиш</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Скачать схему клавиатурных сокращений</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Схема клавиатурных сокращений Merkaartor (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Невозможно открыть файл</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 не может быть открыт.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Сохранить схему клавиатурных сокращений</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>документ Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Невозможно открыть сохранённый файл</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 не может быть открыт для записи.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -236,21 +259,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -280,7 +299,7 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
         <translation>Note that OSM nodes outside the downloaded area will be kept.</translation>
     </message>
@@ -293,7 +312,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
@@ -375,16 +394,6 @@ Server message is '%2'</source>
 Сообщение сервера: '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
-        <source>OPEN changeset</source>
-        <translation>ОТКРЫТЬ пакет правок</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
-        <source>CLOSE changeset</source>
-        <translation>ЗАКРЫТЬ пакет правок</translation>
-    </message>
-    <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
         <source>
 API message is '%1'</source>
@@ -396,6 +405,16 @@ API message is '%1'</source>
         <source>Uploading changes...</source>
         <translation>Передача изменений на сервер</translation>
     </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="490"/>
+        <source>OPEN changeset</source>
+        <translation>ОТКРЫТЬ пакет правок</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyList.cpp" line="517"/>
+        <source>CLOSE changeset</source>
+        <translation>ЗАКРЫТЬ пакет правок</translation>
+    </message>
 </context>
 <context>
     <name>DirtyListExecutorOSC</name>
@@ -498,97 +517,97 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>документ Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Слой черновика</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Слой, переданный на сервер OSM</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Фоновая картинка</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
         <translation>Слой для рисования #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
         <translation>Слой с фильтром #%1</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>Экспорт OSM</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Экспорт OSM...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
         <translation>Документ</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -616,12 +635,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -642,127 +661,73 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Ошибка скачивания</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>ошибка</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>не скачивается достаточно</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation>Неразрешаемые конфликты</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Пожалуйста, разрешите вначале имеющиеся конфликты</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 скачано</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Скачивание точек</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Скачивание не удалось...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Скачивание с OSM (соединение с сервером)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Скачивается неразрешаемый объект %1 из %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation>Неверный логин и пароль</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Обрабатывается неразрешаемый объект %1 из %2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation>Скачиваются точки трека %1-%2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Обработка...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
         <source>Parsing XML</source>
         <translation>Обработка XML</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
         <source>Conflicts from %1</source>
         <translation>Конфликт из %1</translation>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Скачивается %1,%2 (масштаб %3)...</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation>Непредвиденный код статуса http (%1)
-Сервер ответил '%2'</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation>
-сообщение API: '%1'</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation>Скачанный трек - точки %1-%2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 скачано</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Обнаружена пустая линия или отношение</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Скачивается неразрешаемый объект %1 из %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Пустые линии или отношения возможно созданы по ошибке.
+Желаете пометить их для удаления?</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Обрабатывается неразрешаемый объект %1 из %2</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Удаление пустого объекта %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
         <source>Conflicts have been detected</source>
         <translation>Конфликты были устранены</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
         <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
 The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
 Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
@@ -770,117 +735,158 @@ Before being able to upload your changes, you will have to manually merge the tw
 кем-то ещё на сервере. Эти особые объекты продублированы и помечены как "конфликт_..." в слое "Конфликты...". Прежде чем передать изменения на сервер, вы должны вручную объединить эти две версии и удалить их из слоя "Конфликты...".</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Обнаружена пустая линия или отношение</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Передача на сервер...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Пустые линии или отношения возможно созданы по ошибке.
-Желаете пометить их для удаления?</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Подготовка изменений</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Удаление пустого объекта %1</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Ожидание ответа сервера</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>ошибка</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Скачивание с OSM (%n байт)</numerusform>
-            <numerusform>Скачивание с OSM (%n байта)</numerusform>
-            <numerusform>Скачивание с OSM (%n байт)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Скачивание с OSM (%n Кбайт)</numerusform>
-            <numerusform>Скачивание с OSM (%n Кбайта)</numerusform>
-            <numerusform>Скачивание с OSM (%n Кбайт)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
         <source>Downloading...</source>
         <translation>Скачивание...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Обработка...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Скачивание с OSM (соединение с сервером)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Скачивание не удалось...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation>Непредвиденный код статуса http (%1)
+Сервер ответил '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Передача на сервер...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation>
+сообщение API: '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Подготовка изменений</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Ошибка скачивания</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Ожидание ответа сервера</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation>Неверный логин и пароль</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation>Неразрешаемые конфликты</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Пожалуйста, разрешите вначале имеющиеся конфликты</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation>Скачиваются точки трека %1-%2</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation>Скачанный трек - точки %1-%2</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Скачивание точек</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Скачивается %1,%2 (масштаб %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Закрыть</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
         <translation>Невозможно удалить</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
         <translation>Невозможно удалить выбранное, так как оно находиться вне скаченной области.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
         <translation>Невозможно удалить все</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
         <translation>Перевернуть линию %1</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
         <translation>Перевернуть %1 линии</translation>
     </message>
@@ -936,6 +942,11 @@ Delete what can be?</source>
         <translation>Скачать отсутствующих наследников</translation>
     </message>
     <message>
+        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
+        <source>Add to selection</source>
+        <translation>Добавить к выделенному</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
         <translation>Удалить</translation>
@@ -960,11 +971,6 @@ Delete what can be?</source>
         <source>All</source>
         <translation>Всё</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/FeaturesDock.cpp" line="434"/>
-        <source>Add to selection</source>
-        <translation>Добавить к выделенному</translation>
-    </message>
 </context>
 <context>
     <name>FeaturesDockWidget</name>
@@ -1015,7 +1021,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -1071,268 +1077,242 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Ожидание сети</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Невозможно считать данные фотографии с сервера Walking Papers.</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Пожалуйста, укажите URL Walking Papers</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Геоизображения</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Центр карты</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
         <source>c</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Удалить изображения</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Копировать имя файла в буфер</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
+        <source>Select next image</source>
+        <translation>Выбрать следующее изображение</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
+        <source>PgDown</source>
+        <translation>PgDown</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
+        <source>Select previous image</source>
+        <translation>Выбрать предыдущее изображение</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
+        <source>PgUp</source>
+        <translation>PgUp</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Сохранить геотегированное изображение...</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Фотографический слой</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Скачать изображения с геотегами</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>Выделить слой, к которому принадлежат изображения:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
         <source>Layer is read-only</source>
         <translation>Слой только для чтения</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
         <source>The used layer is not writeable. Should it be made writeable?
 If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Скачивание изображений...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Отмена загрузки</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>No such file</source>
+        <translation>Нет такого файла</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
+        <source>Can't find image "%1".</source>
+        <translation>Не могу найти картинку "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Exiv2</source>
+        <translation>Exiv2</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <source>Error while opening "%2":
+%1</source>
+        <translation>Ошибка в момент открытия "%2":%1</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
+        <source>Error while loading EXIF-data from "%1".</source>
+        <translation>Ошибка во время загрузки EXIF-данных из "%1".</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation>Задать смещение</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation>Ещё изображения позиции:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>конец трека</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>начало трека</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>чч:мм:сс</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Точки трека отсутствуют</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Для изображения "%1" нет точек трека</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'секунд'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'минут и' ss 'секунд'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'часов,' mm 'минут и' ss 'секунд'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>Ошибочное изображение?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Изображение "%1" было принято %2 до того, как следующая точка трека
 была записана. Вы всё равно хотите использовать его?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Изображение "%1" было принято %2 после того, как была записана
 последняя точка трека. Вы всё равно хотите использовать его?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>No such file</source>
-        <translation>Нет такого файла</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Ожидание сети</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Невозможно считать данные фотографии с сервера Walking Papers.</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Пожалуйста, укажите URL Walking Papers</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Центр карты</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Сохранить геотегированное изображение...</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Фотографический слой</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
-        <source>Can't find image "%1".</source>
-        <translation>Не могу найти картинку "%1"</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Exiv2</source>
-        <translation>Exiv2</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <source>Error while opening "%2":
-%1</source>
-        <translation>Ошибка в момент открытия "%2":%1</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Точки трека отсутствуют</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Для изображения "%1" нет точек трека</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
         <source>JPEG Images (*.jpg)</source>
         <translation>Изображения JPEG (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
-        <source>Error while loading EXIF-data from "%1".</source>
-        <translation>Ошибка во время загрузки EXIF-данных из "%1".</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Ошибка в момент открытия "%1":%2</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
-        <source>Select next image</source>
-        <translation>Выбрать следующее изображение</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
-        <source>PgDown</source>
-        <translation>PgDown</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
-        <source>Select previous image</source>
-        <translation>Выбрать предыдущее изображение</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
-        <source>PgUp</source>
-        <translation>PgUp</translation>
-    </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Неправильная ссылка OSM</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>Указанная ссылка неверна!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Неправильный формат координат</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Координаты задаются строкой вида: '<left lon>, <bottom lat>, <right lon>, <top lat>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Координаты задаются строкой вида: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Перейти к</translation>
@@ -1345,7 +1325,7 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
@@ -1355,7 +1335,7 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1388,51 +1368,77 @@ Do you still want to use it?</source>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Неправильная ссылка OSM</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>Указанная ссылка неверна!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Неправильный формат координат</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Координаты задаются строкой вида: '<left lon>, <bottom lat>, <right lon>, <top lat>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Координаты задаются строкой вида: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Адаптер форм</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>адаптер WMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>адаптер TMS</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
         <translation>Плагины</translation>
     </message>
@@ -1440,71 +1446,71 @@ Do you still want to use it?</source>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Карта - <отсутствует></translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Карта - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Карта - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Карта - квадраты WMS- %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Карта - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Map - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
         <translation>Условия лицензии: %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
         <translation>Условия лицензии не приняты</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Размер квадрата</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
         <translation>Мин/Макс масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Проекция</translation>
     </message>
@@ -1512,143 +1518,44 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Строка</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Публикация изменений</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Целое</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
+        <source>Input</source>
+        <translation>Ввод</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Число с плавающей точкой</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
+        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Долгота</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Широта</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Неправильная проекция</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Невозможно задать проекцию.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Нет координат</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Отсутствует поле широты или долготы. Невозможно импортировать файл.
-Вы действительно хотите выйти?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Загрузить настройки импорта CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Настройки импорта Merkaartor (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Неверный файл</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 не может быть открыт.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 не является файлом настроек импорта CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>Сохранить настройки импорта CSV</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>документ Merkaartor</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Все файлы (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>Невозможно открыть сохранённые настройки импорта</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 не может быть открыт для записи.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Публикация изменений</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
-        <source>Input</source>
-        <translation>Ввод</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
-        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">1</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
-        <source>OSM Preview</source>
-        <translation>Предварительный просмотр OSM</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
+        <source>OSM Preview</source>
+        <translation>Предварительный просмотр OSM</translation>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
@@ -1688,7 +1595,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1698,12 +1605,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
@@ -1760,18 +1667,117 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Сохранить настройки...</translation>
     </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Строка</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Целое</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Число с плавающей точкой</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Долгота</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Широта</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Неправильная проекция</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Невозможно задать проекцию.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Нет координат</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Отсутствует поле широты или долготы. Невозможно импортировать файл.
+Вы действительно хотите выйти?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Загрузить настройки импорта CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Настройки импорта Merkaartor (*.mis)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Неверный файл</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 не может быть открыт.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 не является файлом настроек импорта CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>Сохранить настройки импорта CSV</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>документ Merkaartor</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Все файлы (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>Невозможно открыть сохранённые настройки импорта</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 не может быть открыт для записи.</translation>
+    </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1785,22 +1791,18 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n особый объект</numerusform>
-            <numerusform>%n особых объекта</numerusform>
-            <numerusform>%n особых объектов</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Особые объекты</translation>
     </message>
@@ -1808,21 +1810,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
-        <source>Layers</source>
-        <translation>Слои</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
-        <source>All</source>
-        <translation>Всё</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
-        <source>Tracks</source>
-        <translation>Треки</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="243"/>
         <location filename="../src/Docks/LayerDock.cpp" line="352"/>
         <source>Show All</source>
@@ -1850,6 +1837,16 @@ p, li { white-space: pre-wrap; }
         <translation>Закрыть</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="395"/>
+        <source>Layers</source>
+        <translation>Слои</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="401"/>
+        <source>All</source>
+        <translation>Всё</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
         <translation>Карта</translation>
@@ -1860,6 +1857,11 @@ p, li { white-space: pre-wrap; }
         <translation>Рисовать</translation>
     </message>
     <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="404"/>
+        <source>Tracks</source>
+        <translation>Треки</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/LayerDock.cpp" line="491"/>
         <source>Reset Layers to default</source>
         <translation>Сброс слоев по умолчанию</translation>
@@ -1868,60 +1870,60 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
-        <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
-        <source>There are dirty features on this layer.
-Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Двойная дорога</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
-        <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
+        <source>Visible</source>
+        <translation>Видимый</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
-        <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation>Вы уверенны, что хотите закрыть этот слой? (Невозможно отменить)</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
+        <source>Readonly</source>
+        <translation>Только для чтения</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>слабо</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>сильно</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>непрозрачный</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Прозрачность</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
-        <source>Visible</source>
-        <translation>Видимый</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <source>Layer CLose: Dirty objects present</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
-        <source>Readonly</source>
-        <translation>Только для чтения</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
+        <source>There are dirty features on this layer.
+Are you sure you want to close it? (no Undo possible)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Двойная дорога</translation>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <source>Layer CLose: Not empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
+        <source>Are you sure you want to close this layer? (no Undo possible)</source>
+        <translation>Вы уверенны, что хотите закрыть этот слой? (Невозможно отменить)</translation>
     </message>
 </context>
 <context>
@@ -1953,2832 +1955,2841 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation>%1 v%2%3(%4)
-Загрузка плагинов...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation>%1 v%2%3(%4)
-Инициализация...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Несохранённые изменения</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>Текущая карта содержит несохранённые ихменения, которые будут потеряны, если начать редактирование новой карты. Хотите отменить начало создания новой карты или продолжить и потерять все изменения?</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>Создать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>Линия</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Неверный файл</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>Правка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 не может быть открыт.</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>Закладки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Установить проекцию</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Обнаружена старая версия Qt</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Задать уровень прозрачности полигонов</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>У вас установлена Qt версии %1, в которой проявляются различные известные ошибки при передаче данных на сервер OpenStreetMap, начинающиеся с кода ответа сервера 401. Вы уверены, что хотите продолжить работу? (Правда это не рекомендуется).
-Для получения дополнительной информации, смотрите http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Передача данных на сервер OSM</translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Вы не указали в настройках ваш
-логин и пароль для сервиса OpenStreetMap.
-Желаете это сделать сейчас?</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Открыть текущее</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Ошибка скачивания</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Импортировать текущее</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Карта не может быть скачана</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>Инструменты</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Ошибка скачивания OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>Стиль</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>Невозможно скачать OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation>Тегировать темплет</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>Точка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>Окно</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Упростить дороги</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>Панели</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Ожидание сети</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Особенность</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Невозможно связаться с OpenStreetBugs.</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Ошибка закрытия дефекта</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>Слои</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Невозможно удалить дефект. Сообщение сервера:%1</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Добавить номер улицы</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Связь</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>Количество сегментов, на которое разделить</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>Показать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation>Укажите количество сегментов</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Показать указатели направления</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>Разделить дорогу на %1</translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Главная панель инструментов</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation>Осевое Выравнивание</translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>О программе &Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation>треугольный</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation>прямоугольный</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Создать новый документ и импортировать файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation>пятиугольный</translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation>шестиугольный</translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Показать всё</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation>семиугольный</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation>восьмиугольный</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Произвольный масштаб</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation>Выравнять по %1 осям</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Произвольный масштаб</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation>Выравнять по %1 регулярным осям</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation>Невозможно выравнять по осям</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>Отдалить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation>Операция выравнивание по осям не выполнена. Пожалуйста, исправьте все острые углы и попробуйте еще раз.</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation>Операция выравнивание по осям не выполнена и не возможно найти решение.</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>Приблизить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Приблизить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation>,Распределить точки</translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Плавное соединение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation>Объединить области</translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Разделить полигон</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation>Пронумеровать %1 внутри полигона</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>Вернуть</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Сохранить стиль карты</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Стиль карты Merkaartor (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>Переместить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Открыть стиль карты</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Поддерживаемые форматы</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation>Merkaartor стиль карты (*.mas)
-</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Импортировать файл в существующий документ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation>MapCSS таблица стилей (*.css)</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>Скачать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Сохранить документ Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Скачать данные карты для новой области</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>документ Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Документы Merkaartor  (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Связь</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Все файлы (*)</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Создать связь</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation>Сохранить шаблон документа Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>Выбрать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation>Невозможно открыть сохранение шаблона документа</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Экспорт OSM</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>Передать на сервер</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>Файлы OSM (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Передать изменения на сервер</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Экспорт osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>Файлы osmChange (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Добавить закладку</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Удалить выделенные особые объекты</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Укажите имя закладки.</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Неверное имя закладки</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Создана новая линия</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Закладка не может быть пустой.</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Внимание: такое имя закладки уже существует</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Создать новую точку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Введите новое значение, оставте тоже самое, что бы перезаписать или нажмите отмена, что бы не добавлять.</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Удалить закладку</translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>Поменять направление</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Выберите закладку для удалени.</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Сменить направление линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation>Внимание! Не возможно загрузить перевод Merkaartor для "%1" языка. Переключение на Английский.</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>Перейти к...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>Справка</translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>Двойная дорога</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>Создать</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Создать Двойную дорогу</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>Линия</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>Правка</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Создать кольцевую развязку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>Вид</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>Закладки</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Создать новый документ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Установить проекцию</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>Разделить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>Файл</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Разделить линию на отдельные (но соединённые друг сдругом) линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>Стиль</translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>Точка</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>Объединить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>Окно</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Объединить соединённые линии в одну</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>Панели</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>Разбить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>Показать</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Разрыв</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>Выход</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Разорвать соединённые линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>О программе &Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>Открыть</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Отношение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Создать новый документ и импортировать файл</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Создано отношение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>Мультиполигон</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Показать всё</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Создать полигон или мультиполигон</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>Правка...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Произвольный масштаб</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Сохранить как...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Произвольный масштаб</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>Загрузить...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>Изогнутая линия</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>Отдалить</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>Параметры...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>Все...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>Приблизить</translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Экспортировать все видимые слои в файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Приблизить</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>Найти...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Поиск</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Плавное соединение</translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Найти и выбрать объекты</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>Отменить</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>Содержимое экрана...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Экспортировать особые объекты из окна просмотра в файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>Вернуть</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>Добавить...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>Удалить...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>Объединить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>Импорт</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Объединить точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Импортировать файл в существующий документ</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Объединить выбранные точки (сохраняется первая выбранная)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Связь</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Создать связь</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Сохранить в файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Скачать ещё</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Скачать больше данных карты для данной области</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>Удалить</translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Скачать область текущего просмотра в ранее загруженный слой</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>Свойства</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Скрыть/Показать панель свойств</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>Поменять направление</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>Двойная дорога</translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Скрыть/Показать панель слоёв</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Скрыть/Показать панель информации</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>Выровнять</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Выровнять точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Выровнять выбранные точки. Первые две выбранных точки образуют линию.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>Распределить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation>Распределить точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Выровнять и распределить выделенные точки одинаково.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Скрыть/Показать панель отмены изменений</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Скачать отсутствующих наследников</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>Новый</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Показать скачанные области</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Создать новый документ</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>Разделить</translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Скопировать выделенные оcобые объекты и теги в конверт</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>Объединить</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Скопировать выделенные теги особых объектов в буфер обмена; если свойство это точка трека, то скопируйте и координаты.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>Разбить</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Вставить теги (Перезаписать)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Вставить (и заменить) теги из буфера обмена в выбранный особый объект.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Отношение</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>Мультиполигон</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Вставить теги (Объединить)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>Сохранить</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Вставить теги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>Распределить</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Вставить теги из буфера обмена (Объединить с существующими тегами)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation>Распределить точки</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Объединить теги из буфера обмена с тегами выделенного особого объекта.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Выровнять и распределить выделенные точки одинаково.</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>Растр/SVG</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Выбранное...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>Показать точки</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Вставить особый объект(ы)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Показать названия</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>Редактор серверов WMS...</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Вставить особые объекты из буфера обмена</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>Редактор серверов TMS...</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Вставить особые объекты в буфер обмена; если id особых объектов уже в документе, переписать их.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation>&Многоугольник</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (бинарный)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Добавить номера улицы (Схема Karlsruhe)</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>Форсировать передачу данных на сервер</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>Подраздел</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Занести особые объекты в слой черновика</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation>Разделить сегмент на равные части</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Занести выбранные особые объекты из непередаваемого слоя (например трек или Extract) в слой черновика, подготовив для передачи на сервер</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation>Разделить выделенный сегмент линии (линию и две смежных точки) на сегменты одинаковой длины</translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>Показать сетку шир/дол</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>Зафиксировать масштаб на уровне фона разбитого на квадраты</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>Редактор проекций...</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Скрыть/Показать панель инструментов</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>Показать фортографии на карте</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Скрыть всё</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Принудительно удалить</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Показать всё</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Закрыть</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>Слой изображения</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>Упростить</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>Растр/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Упростить дороги</translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Показать точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Упростить линию, удалив ненужные дочерние точки</translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>&Редактор фильтров</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Показать названия</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>Отсутствует</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation>&Объединить Области</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>Начать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation>Объединить соприкасающиеся области</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Старт GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation>Объединить соприкасающиеся области</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>Повтор...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>Область разделения</translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Воспроизвести заново GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation>Разделить полигон между двумя точками</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation>Разбить выбранную область между двумя выбранными точками на две части.</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Скрыть/Показать панель GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>Нумеровать дома вдоль улицы</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation>Пронумеровать дома внутри полигона</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>Стоп</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation>Разделить выбранный полигон на зоны с нумерованными рядами домов.</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Выключить GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation>Редактор панели инструментов...</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>Центрировать по GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation>О&севое Выравнивание</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Показать отрезки трека</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation>Выравнять края по регулярным осям.</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation>Выровнять края на определенную величину равных расстояний осей.</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Показать масштаб</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation>&Печать...</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation>Предварительный просмотр...</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Показать отношения</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation>Выделить неверны&е свойства</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation>Вы&резать</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Показать фон линий</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Показать границы линий</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation>В&ыдавить</translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Показать последние правки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Запись</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation>Alt+X</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Записать GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation>Выбрать переключатель</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation>Добавить к выбранному дочерние элементы</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Пауза в работе GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation>Масштаб</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>Геоизображение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation>Сохранить как шаблон документа...</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Скрыть/Показать панель GeoImage</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>Изогнутая линия</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>Параметры...</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Менеджер World OSB...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>Все...</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>Комбинации клавиш...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Экспортировать все видимые слои в файл</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>Объединить...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>Найти...</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>Сохранить...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Найти и выбрать объекты</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>Добавить участника</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>Содержимое экрана...</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>Удалить участника</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Экспортировать особые объекты из окна просмотра в файл</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>Никогда</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>Добавить...</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>для дорог с односторонним движением</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>Удалить...</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>Всегда</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>Объединить</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>Отделить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Объединить выбранные точки (сохраняется первая выбранная)</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Отделить точку от линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Отделить точку от линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Сохранить как...</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>Работать автономно</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Скачать ещё</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>Стили</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Скачать область текущего просмотра в ранее загруженный слой</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Спрятать/Показать окно выбора стилей</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Скрыть/Показать панель свойств</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>Редактор серверов WMS...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>Редактор серверов TMS...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Скрыть/Показать панель слоёв</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>Сбросить отменяемый статус диалогов</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Меню GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Скрыть/Показать панель информации</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Камера</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Создать соединение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>Выровнять</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Вращать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Выровнять выбранные точки. Первые две выбранных точки образуют линию.</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation>&Многоугольник</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Unresolved conflicts</source>
-        <translation>Неразрешаемые конфликты</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation>Пожалуйста, разрешите вначале имеющиеся конфликты</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Очищен тег '%1' для %2</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Особые объекты</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Создан полигон %1</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Добавить номера улицы (Схема Karlsruhe)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Полигон: Создана линия %1</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>Подраздел</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Полигон: Закончена линия %1</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation>Разделить сегмент на равные части</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Полигон: Добавлена точка %1 на линию %2</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation>Разделить выделенный сегмент линии (линию и две смежных точки) на сегменты одинаковой длины</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation>Закрыть Область %1</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Показать виртуальные точки</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Показать сетку шир/дол</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Добавлены точки к двойной дороге %1</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>Зафиксировать масштаб на уровне фона разбитого на квадраты</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Создана Двойная линия %1</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>Редактор проекций...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Создана точка на линии %1</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>Показать фортографии на карте</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation>Создать POI %1</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Создать кольцевую развязку %1</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Принудительно удалить</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Создана точку %1 на линии %2</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Создана линия: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation>Закрыть Дорогу %1</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>Упростить</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Упростить дороги</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation>КЛИК для выбора/перемещения;CTRL-КЛИК для переключения выбора;SHIFT-КЛИК добавить к выбранному;SHIFT-ПЕРЕМЕЩЕНИЕ для выбора места;CTRL-ПЕРЕМЕЩЕНИЕ для изменения масштаба;ДВОЙНОЙ-КЛИК создание точки;ДВОЙНОЙ-КЛИК по точке для создания линии;</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>Упростить линию, удалив ненужные дочерние точки</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Удалить особый объект %1</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>&Редактор фильтров</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation>Удалить свойства</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>Отсутствует</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation>Вы также хотите удалить дочерние точки?
-Точки OSM вне загруженной области будут сохранены.</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation>&Объединить Области</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation>Перевернуть %1 линии</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation>Объединить соприкасающиеся области</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Конверт неисправен</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation>Объединить соприкасающиеся области</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>В конверте нет правильных данных.</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>Область разделения</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Объединить линии</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation>Разделить полигон между двумя точками</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Разделить линии</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation>Разбить выбранную область между двумя выбранными точками на две части.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Разрезать линии</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>Нумеровать дома вдоль улицы</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Создано отношение %1</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation>Пронумеровать дома внутри полигона</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Неверный файл</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation>Разделить выбранный полигон на зоны с нумерованными рядами домов.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 - не документ Merkaartor.</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation>Редактор панели инструментов...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Экспорт GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation>О&севое Выравнивание</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Файлы GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation>Выравнять края по регулярным осям.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Экспорт KML</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation>Выровнять края на определенную величину равных расстояний осей.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Файлы KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation>&Печать...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Выровнять точки</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation>Предварительный просмотр...</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Объеденить точки в %1</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Свойства...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Скрыть/Показать панель отмены изменений</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation>Выделить неверны&е свойства</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation>Вы&резать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Скопировать выделенные теги особых объектов в буфер обмена; если свойство это точка трека, то скопируйте и координаты.</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Вставить (и заменить) теги из буфера обмена в выбранный особый объект.</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation>В&ыдавить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Объединить теги из буфера обмена с тегами выделенного особого объекта.</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation>Alt+X</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation>Выбрать переключатель</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Выбранное...</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation>Добавить к выбранному дочерние элементы</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Вставить особые объекты в буфер обмена; если id особых объектов уже в документе, переписать их.</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation>Сохранить как шаблон документа...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (бинарный)</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Занести выбранные особые объекты из непередаваемого слоя (например трек или Extract) в слой черновика, подготовив для передачи на сервер</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Изменено отношение %1</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
-        <source>It is strongly recommended to save the changes to your document after an upload.
-Do you want to do this now?</source>
-        <translation>Мы рекомендуем сохранить изменения в документе после передачи их на сервер.
-Хотите сделать это сейчас?</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="133"/>
-        <location filename="../src/common/TagModel.cpp" line="164"/>
-        <source>Set Tags on %1</source>
-        <translation>Назначить тег для %1</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Создать точку: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Добавлена точка %1 к дороге %2</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Скачать отсутствующих наследников</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>квадрат карты %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Свойства...</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation>Файл</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Очищен тег '%1' для %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Правка</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Стереть %1 тегов на %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>Вид</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>Показать</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Удалить участника '%1' в %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Стрелки-указатели</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Упорядочить участников отношения %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Изменено отношение %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Слои</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Создание точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Создать</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Создана точка на линии %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Особый объект</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Создание мультиполигона</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Точка</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Создан полигон %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Линия</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Полигон: Создана линия %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Отношение</translation>
-    </message>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Добавить дыру.</translation>
+    </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>Формат обмена GPS (*.gpx)
-</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Желаете вложить полигон в этот полигон?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>Формат OpenStreetMap (*.osm)
-</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Полигон: Закончена линия %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>Формат обмена OpenStreetMap (*.osc)
-</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Полигон: Добавлена точка %1 на линию %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Не формат GPSPlot (*.ngt)
-</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation>Закрыть Область %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>Формат журнала NMEA GPS (*.nmea *.nma)
-</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>файл KML (*.kml)
-</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Добавлены точки к двойной дороге %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Формат с разделением запятаей (*.csv)
-</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Создана Двойная линия %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Изображения с геотегами (*.jpg)
-</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation>Создать POI %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>Шейпфайл ESRI (*.shp)
-</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>LEFT-CLICK - начать;DRAG - масштабировать;SHIFT-DRAG - повернуть;LEFT-CLICK - закончить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation>Язык Географической Разметки  (*.gml)
-</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Создание многоугольника</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Создать многоугольник %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Документ Merkaartor (*.mdc)
-</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Создание круговой развязки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Линия</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Создать кольцевую развязку %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Загрузить изображение</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Создание линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Добавить точку положения на изображение</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Создана точку %1 на линии %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Геотегированное изображение этого положения</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Создана линия: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Создать точку: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Инструменты</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Добавлена точка %1 к дороге %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation>Окна</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation>Закрыть Дорогу %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Справка</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation>Вырезать Свойства</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation>КЛИК для выбора/перемещения;CTRL-КЛИК для переключения выбора;SHIFT-КЛИК добавить к выбранному;SHIFT-ПЕРЕМЕЩЕНИЕ для выбора места;CTRL-ПЕРЕМЕЩЕНИЕ для изменения масштаба;ДВОЙНОЙ-КЛИК создание точки;ДВОЙНОЙ-КЛИК по точке для создания линии;</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Отслеживание курсора</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Путевые точки</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Удалить особый объект %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Трек %1</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation>Удалить свойства</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Big Fat Copyright Warning</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Удалить наследника.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Вы пытаетесь импортировать файл KML. Пожалуйста, имейте в виду, что:
-
- - Вы не можете импортировать файл KML в OSM, если он создан в Google Earth. Несмотря на то,
-   что вы и можете думать, что точки, которые вы создали в GE - ваши, однако, это не так!
-   Они являются производной работы GE, потому не могут использоваться в OSM.
-
- - Если вы скачали их из интернета, велик шанс, что они имеют копирайт.
-   Пожалуйста, убедитесь в том, что их использование в OSM разрешено автором,
-   или что данные публичны.
-
-Если вы не уверены, обращайтесь за справкой к спискам рассылки openstreetmap "legal" или "talk".
-
-Итак, вы абсолютно уверены, что этот KML может быть легально импортирован в OSM?</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation>Вы также хотите удалить дочерние точки?
+Точки OSM вне загруженной области будут сохранены.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation>Открыть файлы</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation>Перевернуть %1 линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation>Выдавить Дорогу %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Невозможно открыть сохранённый файл</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>LEFT-CLICK - выделить;LEFT-DRAG - передвинуть</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 не может быть открыт для записи.</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Перетаскивание точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Переместить точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Передвинуть точку %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Найдены совпадающие точки.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>ошибка GPS</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Вы хотите слить все близко расположенные точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Невозможно открыть порт GPS.</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Объеденить точки в %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Открыть файл журнала NMEA</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>Слои</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Вращение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>Главная панель инструментов</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation>Свойства поворота</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>Передать на сервер</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>Перейти к...</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation>Взаимодействие Масштаба</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation>Свойства Масштаба</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Создать Двойную дорогу</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>LEFT-CLICK - первый угол-> LEFT-DRAG охватить область-> LEFT-CLICK - приблизить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Приближение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Создать кольцевую развязку</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>Формат обмена GPS (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Создано отношение</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>Формат OpenStreetMap (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Поиск</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>Формат обмена OpenStreetMap (*.osc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Объединить точки</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Не формат GPSPlot (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Показать скачанные области</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>Формат журнала NMEA GPS (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Занести особые объекты в слой черновика</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>файл KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Панель инструментов</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Формат с разделением запятаей (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Скрыть/Показать панель инструментов</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Изображения с геотегами (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Скрыть всё</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>Шейпфайл ESRI (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation>Язык Географической Разметки  (*.gml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Показать всё</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>Слой изображения</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Поддерживаемые форматы</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Документ Merkaartor (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>Начать</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>квадрат карты %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Старт GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Не могу загрузить файл проэкций</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>Повтор...</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projections.xml" не может быть нигде открыт. Отказ.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Воспроизвести заново GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>слабо</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Скрыть/Показать панель GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>сильно</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>непрозрачный</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>Стоп</translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Особый объект</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Выключить GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Точка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>Центрировать по GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Линия</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Показать отрезки трека</translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Отношение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Загрузить изображение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Показать масштаб</translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Добавить точку положения на изображение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Геотегированное изображение этого положения</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Показать отношения</translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Показать фон линий</translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Правка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Показать границы линий</translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Показать последние правки</translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Показать</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Стрелки-указатели</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Слои</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Создать</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Запись</translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Линия</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Записать GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Инструменты</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Пауза</translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation>Окна</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Пауза в работе GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Скрыть/Показать панель GeoImage</translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation>Вырезать Свойства</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Конверт неисправен</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Менеджер World OSB...</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>В конверте нет правильных данных.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>Комбинации клавиш...</translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>Скачать</translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Несохранённые изменения</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Сохранить шаблоны тегов</translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>Текущая карта содержит несохранённые ихменения, которые будут потеряны, если начать редактирование новой карты. Хотите отменить начало создания новой карты или продолжить и потерять все изменения?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Шаблоны тегов Merkaartor (*.mat)</translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Открыть шаблоны тегов</translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>Правка...</translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Путевые точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>Сохранить...</translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Трек %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>Загрузить...</translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Big Fat Copyright Warning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>Объединить...</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Вы пытаетесь импортировать файл KML. Пожалуйста, имейте в виду, что:
+
+ - Вы не можете импортировать файл KML в OSM, если он создан в Google Earth. Несмотря на то,
+   что вы и можете думать, что точки, которые вы создали в GE - ваши, однако, это не так!
+   Они являются производной работы GE, потому не могут использоваться в OSM.
+
+ - Если вы скачали их из интернета, велик шанс, что они имеют копирайт.
+   Пожалуйста, убедитесь в том, что их использование в OSM разрешено автором,
+   или что данные публичны.
+
+Если вы не уверены, обращайтесь за справкой к спискам рассылки openstreetmap "legal" или "talk".
+
+Итак, вы абсолютно уверены, что этот KML может быть легально импортирован в OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Добавлен элемент в отношение</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Неверный файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Удалить элемент из отношения</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 не может быть открыт.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Показать указатели направления</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Связь</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>Добавить участника</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>Удалить участника</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation>Открыть файлы</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>Никогда</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Обнаружена старая версия Qt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>для дорог с односторонним движением</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>У вас установлена Qt версии %1, в которой проявляются различные известные ошибки при передаче данных на сервер OpenStreetMap, начинающиеся с кода ответа сервера 401. Вы уверены, что хотите продолжить работу? (Правда это не рекомендуется).
+Для получения дополнительной информации, смотрите http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>Всегда</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Передача данных на сервер OSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Найдены совпадающие точки.</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Вы не указали в настройках ваш
+логин и пароль для сервиса OpenStreetMap.
+Желаете это сделать сейчас?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Вы хотите слить все близко расположенные точки</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Ошибка скачивания</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>слабо</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Карта не может быть скачана</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>сильно</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Ошибка скачивания OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>непрозрачный</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>Невозможно скачать OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Отделить точку %1</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Задать уровень прозрачности полигонов</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>Экспорт</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Создать многоугольник</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Открыть текущее</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Задать количество сторон</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Импортировать текущее</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Объединить линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>Инструменты</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Разделить линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation>Тегировать темплет</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Разрезать линии</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Особенность</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Упростить дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>Переместить</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Принудительно передать особый объект на сервер</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Скачать данные карты для новой области</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Ожидание сети</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>Выбрать</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Невозможно связаться с OpenStreetBugs.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Передать изменения на сервер</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Ошибка закрытия дефекта</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Удалить выделенные особые объекты</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Невозможно удалить дефект. Сообщение сервера:%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Создана новая линия</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Создать соединение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Создать новую точку</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Многократное пересечение.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Сменить направление линии</translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Эти линии имеют несколько пересечений.
+Вы всё ещё хотите создать соединения для каждой из них? (Нежелательные пересечения можно позже удалить вручную)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Разделить линию на отдельные (но соединённые друг сдругом) линии</translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Добавить номер улицы</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Объединить соединённые линии в одну</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>Количество сегментов, на которое разделить</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Разрыв</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation>Укажите количество сегментов</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Разорвать соединённые линии</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>Разделить дорогу на %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Создать полигон или мультиполигон</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation>Осевое Выравнивание</translation>
     </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Сохранить в файл</translation>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Скачать больше данных карты для данной области</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation>треугольный</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>Свойства</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation>прямоугольный</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>Информация</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation>пятиугольный</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Выровнять точки</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation>шестиугольный</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>Копировать</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation>семиугольный</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Скопировать выделенные оcобые объекты и теги в конверт</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation>восьмиугольный</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Вставить теги (Перезаписать)</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation>Выравнять по %1 осям</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Вставить теги (Объединить)</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation>Выравнять по %1 регулярным осям</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Вставить теги</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation>Невозможно выравнять по осям</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Вставить теги из буфера обмена (Объединить с существующими тегами)</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation>Операция выравнивание по осям не выполнена. Пожалуйста, исправьте все острые углы и попробуйте еще раз.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Вставить</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation>Операция выравнивание по осям не выполнена и не возможно найти решение.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Вставить особые объекты из буфера обмена</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Выровнять точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>Геоизображение</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation>,Распределить точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>Отделить</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Отделить точку %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Отделить точку от линии</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Добавлен элемент в отношение</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Отделить точку от линии</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Удалить элемент из отношения</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>Работать автономно</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation>Объединить области</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>Стили</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Разделить полигон</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Спрятать/Показать окно выбора стилей</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation>Пронумеровать %1 внутри полигона</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Удалить участника '%1' в %2</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Создано отношение %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Сохранить стиль карты</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Добавить дыру.</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Стиль карты Merkaartor (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Желаете вложить полигон в этот полигон?</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Открыть стиль карты</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Не могу загрузить файл проэкций</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation>Merkaartor стиль карты (*.mas)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>"Projections.xml" не может быть нигде открыт. Отказ.</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation>MapCSS таблица стилей (*.css)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Создать соединение</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Неправильная проекция</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Невозможно задать проекцию "%1".</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>документ Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Сохранить документ Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>Сбросить отменяемый статус диалогов</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Документы Merkaartor  (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Меню GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation>Сохранить шаблон документа Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Камера</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Невозможно открыть сохранённый файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Создать соединение</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 не может быть открыт для записи.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Удалить наследника.</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation>Невозможно открыть сохранение шаблона документа</translation>
     </message>
     <message>
-        <location filename="../src/common/TagModel.cpp" line="131"/>
-        <location filename="../src/common/TagModel.cpp" line="162"/>
-        <source>Set Tags on multiple features</source>
-        <translation>Назначить теги на несколько особых объектов</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Неверный файл</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Создание мультиполигона</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 - не документ Merkaartor.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Создание точки</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Экспорт OSM</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>LEFT-CLICK - начать;DRAG - масштабировать;SHIFT-DRAG - повернуть;LEFT-CLICK - закончить</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>Файлы OSM (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Создание многоугольника</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Экспорт osmChange</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Создать многоугольник %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>Файлы osmChange (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Создание круговой развязки</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Экспорт GPX</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Создание линии</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Файлы GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Отслеживание курсора</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Экспорт KML</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Переместить точки</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Файлы KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Передвинуть точку %1</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>LEFT-CLICK - выделить;LEFT-DRAG - передвинуть</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Перетаскивание точки</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Вращение</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Добавить закладку</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation>Свойства поворота</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Укажите имя закладки.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>LEFT-CLICK - первый угол-> LEFT-DRAG охватить область-> LEFT-CLICK - приблизить</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Неверное имя закладки</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Приближение</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Закладка не может быть пустой.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Создать многоугольник</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Внимание: такое имя закладки уже существует</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Задать количество сторон</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Введите новое значение, оставте тоже самое, что бы перезаписать или нажмите отмена, что бы не добавлять.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Принудительно передать особый объект на сервер</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Удалить закладку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>Форсировать передачу данных на сервер</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Выберите закладку для удалени.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Вращать</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Неправильная проекция</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Невозможно задать проекцию "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Многократное пересечение.</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>ошибка GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Эти линии имеют несколько пересечений.
-Вы всё ещё хотите создать соединения для каждой из них? (Нежелательные пересечения можно позже удалить вручную)</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Невозможно открыть порт GPS.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Вставить особый объект(ы)</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Открыть файл журнала NMEA</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Особые объекты</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Сохранить шаблоны тегов</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Показать виртуальные точки</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Шаблоны тегов Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Стереть %1 тегов на %2</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Открыть шаблоны тегов</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Упорядочить участников отношения %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation>Внимание! Не возможно загрузить перевод Merkaartor для "%1" языка. Переключение на Английский.</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation>Выдавить Дорогу %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Unresolved conflicts</source>
+        <translation>Неразрешаемые конфликты</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation>Пожалуйста, разрешите вначале имеющиеся конфликты</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation>Взаимодействие Масштаба</translation>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
+        <source>It is strongly recommended to save the changes to your document after an upload.
+Do you want to do this now?</source>
+        <translation>Мы рекомендуем сохранить изменения в документе после передачи их на сервер.
+Хотите сделать это сейчас?</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation>Свойства Масштаба</translation>
+        <location filename="../src/common/TagModel.cpp" line="131"/>
+        <location filename="../src/common/TagModel.cpp" line="162"/>
+        <source>Set Tags on multiple features</source>
+        <translation>Назначить теги на несколько особых объектов</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/TagModel.cpp" line="133"/>
+        <location filename="../src/common/TagModel.cpp" line="164"/>
+        <source>Set Tags on %1</source>
+        <translation>Назначить тег для %1</translation>
     </message>
 </context>
 <context>
     <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
         <source><i>V: </i><b>%1</b> </source>
         <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
         <source><i>last: </i><b>%1</b> by <b>%2</b></source>
         <translation><i>посл.: </i><b>%1</b> от <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
         <source><i>last: </i><b>%1</b></source>
         <translation><i>посл.: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
         <source><br/><i>layer: </i><b>%1</b> </source>
         <translation><br/><i>слой: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
         <source>Browse</source>
         <translation>Обзор</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Путевая точка</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>коорд</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>описание</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>комментарий</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Точка</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>высота</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>скорость</translation>
+    </message>
+    <message>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>размер</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>участники</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>Верхний левый угол</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>Правый нижний угол</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Отношение</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Роль</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Член</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
         <translation>Закрытая линия</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
-        <source>%1 nodes</source>
-        <translation>точек: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Линия</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Мультиполигон</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>коорд</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Точка</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Длина</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>высота</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>скорость</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Путевая точка</translation>
+        <location filename="../src/Features/Way.cpp" line="908"/>
+        <source>%1 nodes</source>
+        <translation>точек: %1</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>описание</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Мультиполигон</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>комментарий</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Линия</translation>
     </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 м</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 км</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 м</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 км</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
         <translation>Ограничивающий Прямоугольник</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Проекция</translation>
     </message>
@@ -4786,34 +4797,44 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
 <context>
     <name>MerkaartorPreferences</name>
     <message>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
-        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
-        <source>New Server</source>
-        <translation>Новый сервер</translation>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
+        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
+        <source>New Bookmark</source>
+        <translation>Новая закладка</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Передача параметров на сервер не удалась</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Дублировать ключ</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Более чем 150 параметров</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="20"/>
-        <location filename="../src/Preferences/BookmarksList.cpp" line="27"/>
-        <source>New Bookmark</source>
-        <translation>Новая закладка</translation>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
+        <location filename="../src/Preferences/WmsServersList.cpp" line="40"/>
+        <source>New Server</source>
+        <translation>Новый сервер</translation>
     </message>
 </context>
 <context>
@@ -4842,17 +4863,17 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
         <translation>Класс</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Неизвестное поле</translation>
     </message>
@@ -4865,25 +4886,10 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Ошибка!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Сервер поиска названий не найден.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Сервер поиска названий сбросил соединение.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Сервис поиска названий требует проверку подлинности.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Неизвестная ошибка.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4904,11 +4910,6 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation>PDF файлы (*.pdf)</translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4916,6 +4917,11 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation>PDF файлы (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4977,7 +4983,7 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
@@ -5021,65 +5027,26 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Всегда</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Выбрать цвет</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Редактор стиля карты</translation>
     </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
-        <source>Add</source>
-        <translation>Добавить</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
-        <source>Remove</source>
-        <translation>Удалить</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
-        <source>Tag selection</source>
-        <translation>Выбор тега</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
-        <source>meter/pixel</source>
-        <translation>метров на пиксель</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
-        <source>Visible up to</source>
-        <translation>Видимый от</translation>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
+        <source>Global</source>
+        <translation>Общий</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
-        <source>Visible from scale</source>
-        <translation>Видимый при масштабе</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
+        <source>Background</source>
+        <translation>Фон</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="53"/>
@@ -5098,6 +5065,11 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
@@ -5118,26 +5090,19 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Фиксированная тощина</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
-        <source>Dashed</source>
-        <translation>Пунктир</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
-        <source>off</source>
-        <translation>через</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
+        <source>Filter</source>
+        <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
-        <source>Fill area</source>
-        <translation>Закрасить полигон</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
+        <source>Add</source>
+        <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
-        <source>Draw icon</source>
-        <translation>Рисовать значёк</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="237"/>
+        <source>Remove</source>
+        <translation>Удалить</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="244"/>
@@ -5145,20 +5110,25 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Сделать копию</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="37"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="456"/>
-        <source>Background</source>
-        <translation>Фон</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="330"/>
+        <source>Tag selection</source>
+        <translation>Выбор тега</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="357"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="413"/>
+        <source>meter/pixel</source>
+        <translation>метров на пиксель</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
-        <source>Filter</source>
-        <translation>Фильтр</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
+        <source>Visible up to</source>
+        <translation>Видимый от</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
+        <source>Visible from scale</source>
+        <translation>Видимый при масштабе</translation>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="470"/>
@@ -5168,9 +5138,26 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Рисовать цветом</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
+        <source>Dashed</source>
+        <translation>Пунктир</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
+        <source>off</source>
+        <translation>через</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
+        <source>Fill area</source>
+        <translation>Закрасить полигон</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5180,12 +5167,12 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5198,9 +5185,14 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Нарисовать след</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
+        <source>Draw icon</source>
+        <translation>Рисовать значёк</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5238,9 +5230,23 @@ Do you still want to create a junction for each one (Unwanted junctions can stil
         <translation>Ярлык с тегом фона</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
-        <source>Global</source>
-        <translation>Общий</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Всегда</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Выбрать цвет</translation>
     </message>
 </context>
 <context>
@@ -5291,6 +5297,11 @@ What do you want to do next?</source>
 <context>
     <name>PictureViewerDialog</name>
     <message>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Публикация изменений</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>Output filename</source>
@@ -5304,6 +5315,11 @@ What do you want to do next?</source>
     </message>
     <message>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>Файлы SVG (*.svg)</translation>
+    </message>
+    <message>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
         <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
         <source>All Files (*)</source>
         <translation>Все файлы (*)</translation>
@@ -5313,16 +5329,6 @@ What do you want to do next?</source>
         <source>Image files (*.png *.jpg)</source>
         <translation>Файлы изображений (*.png *.jpg)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Публикация изменений</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>Файлы SVG (*.svg)</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
@@ -5342,19 +5348,150 @@ What do you want to do next?</source>
         <translation>Основное</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
-        <source>Zoom Out/in (%)</source>
-        <translation>Масштаб -/+ (%)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
+        <source>Zoom Out/in (%)</source>
+        <translation>Масштаб -/+ (%)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
+        <source>Opacity low/high</source>
+        <translation>Прозрачность мин/макс</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
+        <source>Single mouse button interaction</source>
+        <translation>Работа однокнопочной мышью</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
+        <source>Use custom Qt style</source>
+        <translation>Использовать пользовательский стиль Qt</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation>Разрешить создание точек/линий в режиме выбора</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Режим разделения движения</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Использовать Виртуальные точки (требуется новая сессия)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Отношения можно выбирать, даже если они скрыты</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
+        <source>Colors</source>
+        <translation>Цвета</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
+        <source>Background</source>
+        <translation>Фон</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
+        <source>Overwrite style</source>
+        <translation>Перезаписать стиль</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>Трек GPX</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
+        <source>Pixels</source>
+        <translation>Пикселей</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
+        <source>Use simple GPX track appearance</source>
+        <translation>Использовать простой вид треков GPX</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Интерфейс</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Подсветка</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Отношения</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Фокус</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Подсветить</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation>Нечистый</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Язык</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Необходимо перезапустить программу, что бы изменения вступили в силу</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Использовать язык</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
-        <source>Opacity low/high</source>
-        <translation>Прозрачность мин/макс</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Переводить стандартные теги</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
@@ -5364,22 +5501,22 @@ What do you want to do next?</source>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
@@ -5389,17 +5526,17 @@ What do you want to do next?</source>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
@@ -5407,89 +5544,67 @@ What do you want to do next?</source>
         <translation>Стиль карты</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Собственный</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation>Автоматически загружать документ шаблона</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
-        <source>Network</source>
-        <translation>Сеть</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Каталог назначения стилей</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
-        <source>Proxy settings</source>
-        <translation>Настройки прокси сервера</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Текущий стиль</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
-        <source>Use Proxy</source>
-        <translation>Использовать прокси</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Не использовать стили для слоёв с треками</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
-        <source>Host:</source>
-        <translation>Адрес:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Шаблон</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
-        <source>Port:</source>
-        <translation>Порт:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Шаблон тега</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
-        <source>Background Image</source>
-        <translation>Фоновое изображение</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Встроенный</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
-        <source>Cache directory</source>
-        <translation>Директория кеша</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Собственный</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
-        <source>Cache size (in Mb; 0 to disable)</source>
-        <translation>Размер кеша (в МБ; 0 для отключения)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Данные</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
-        <source>Map Adapter</source>
-        <translation>Адаптер карты</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
+        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
+        <translation>OSM API (ссылка, например, "http://www.openstreetmap.org/api/0.6"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Встроенный</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
+        <source>XAPI</source>
+        <translation>XAPI</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Не использовать стили для слоёв с треками</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Данные</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
+        <source>Nominatim (Geo Search)</source>
+        <translation>Nominatim (Geo Поиск)</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
@@ -5497,6 +5612,11 @@ What do you want to do next?</source>
         <translation>Документы</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation>Автоматически загружать документ шаблона</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
         <source>Autosave documents after upload</source>
         <translation>Автоматически сохранить документ после передачи его на сервер</translation>
@@ -5512,194 +5632,135 @@ What do you want to do next?</source>
         <translation>Автоматически извлекать треки при открытии</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Выбрать цвет</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Инструмент уже присутствует</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Инструмент с таким именем уже существует.
-Выберите другое имя, либо нажмите <Apply>, если хотите изменить существующее</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Невозможно удалить инструмент заготовки</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Невозможно удалить инструмент заготовки "%1"</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Невозможно изменить имя инструмента заготовки</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Невозможно изменить имя инструмента заготовки "%1"'</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Выберите исполняемый файл инструмента</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
+        <source>Track layers readonly by default</source>
+        <translation>По умолчанию слои треков - только для чтения</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation>Выбрать шаблон документа</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
+        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
+        <translation>Не соединять путевые точки GPX, удаленные друг от друга более, чем (в км; 0 - чтобы отменить)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation>Merkaartor документ (*.mdc)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
+        <source>GDAL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Выберите директорию для журналов</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Язык</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Необходимо перезапустить программу, что бы изменения вступили в силу</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation>Ввод GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Использовать язык</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Переводить стандартные теги</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation>Serial</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
-        <source>Colors</source>
-        <translation>Цвета</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="171"/>
-        <source>Background</source>
-        <translation>Фон</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="186"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="236"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="301"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="347"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="393"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="446"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="513"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="746"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="864"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="995"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1219"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1555"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
+        <source>Save NMEA log</source>
+        <translation>Сохранить журнал NMEA</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Подсветка</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
+        <source>Set system time to GPS</source>
+        <translation>Установить системное время по GPS</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="317"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="363"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="409"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
-        <source>Pixels</source>
-        <translation>Пикселей</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
+        <source>Network</source>
+        <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Фокус</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1264"/>
+        <source>Proxy settings</source>
+        <translation>Настройки прокси сервера</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Отношения</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1270"/>
+        <source>Use Proxy</source>
+        <translation>Использовать прокси</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation>Разрешить создание точек/линий в режиме выбора</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation>Нечистый</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
+        <source>User:</source>
+        <translation>Пользователь:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
-        <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation>OSM API (ссылка, например, "http://www.openstreetmap.org/api/0.6"</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
-        <source>XAPI</source>
-        <translation>XAPI</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
+        <source>Host:</source>
+        <translation>Адрес:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
+        <source>Network Timeout (sec)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
-        <source>Nominatim (Geo Search)</source>
-        <translation>Nominatim (Geo Поиск)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
+        <source>Enable JOSM-compatible local server on port 8111</source>
+        <translation>Разрешить локальный JOSM-совместимый сервер на порт 8111</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
+        <source>Background Image</source>
+        <translation>Фоновое изображение</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
-        <source>Save NMEA log</source>
-        <translation>Сохранить журнал NMEA</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
+        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
+        <translation>Кеширование квадратов (не активно для Yahoo! из-за правовых ограничений)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
-        <source>Set system time to GPS</source>
-        <translation>Установить системное время по GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
+        <source>Cache directory</source>
+        <translation>Директория кеша</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
-        <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1446"/>
+        <source>Cache size (in Mb; 0 to disable)</source>
+        <translation>Размер кеша (в МБ; 0 для отключения)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
-        <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation>Разрешить локальный JOSM-совместимый сервер на порт 8111</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
+        <source>Map Adapter</source>
+        <translation>Адаптер карты</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
@@ -5737,68 +5798,6 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Шаблон тега</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Шаблон тега Merkaartor (*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
-        <source>Single mouse button interaction</source>
-        <translation>Работа однокнопочной мышью</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Шаблон</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
-        <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation>Кеширование квадратов (не активно для Yahoo! из-за правовых ограничений)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="199"/>
-        <source>Overwrite style</source>
-        <translation>Перезаписать стиль</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Каталог назначения стилей</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Режим разделения движения</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
-        <source>Use custom Qt style</source>
-        <translation>Использовать пользовательский стиль Qt</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Текущий стиль</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
-        <source>Track layers readonly by default</source>
-        <translation>По умолчанию слои треков - только для чтения</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
-        <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation>Не соединять путевые точки GPX, удаленные друг от друга более, чем (в км; 0 - чтобы отменить)</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
         <source>English</source>
         <translation>Английский</translation>
@@ -5811,7 +5810,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
         <source>Croatian</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
@@ -5819,6 +5818,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Чешский</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Голландский</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
         <source>German</source>
         <translation>Немецкий</translation>
@@ -5849,6 +5853,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Польский</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
+        <source>Portuguese</source>
+        <translation>Португальский</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
         <source>Brazilian Portuguese</source>
         <translation>Бразильский португальский</translation>
@@ -5859,95 +5868,86 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Русский</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
-        <source>User:</source>
-        <translation>Пользователь:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Подсветить</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>Трек GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
+        <source>Slovak</source>
+        <translation>Словацкий</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
-        <source>Use simple GPX track appearance</source>
-        <translation>Использовать простой вид треков GPX</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
+        <source>Spanish</source>
+        <translation>Испанский</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation>Ввод GPS</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
+        <source>Swedish</source>
+        <translation>Шведский</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
+        <source>Ukrainian</source>
+        <translation>Украинский</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation>Serial</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Шаблон тега Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Порт</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Выбрать цвет</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Сервер</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Инструмент уже присутствует</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Использовать Виртуальные точки (требуется новая сессия)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Инструмент с таким именем уже существует.
+Выберите другое имя, либо нажмите <Apply>, если хотите изменить существующее</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Голландский</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Невозможно удалить инструмент заготовки</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
-        <source>Portuguese</source>
-        <translation>Португальский</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Невозможно удалить инструмент заготовки "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
-        <source>Slovak</source>
-        <translation>Словацкий</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Невозможно изменить имя инструмента заготовки</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="177"/>
-        <source>Spanish</source>
-        <translation>Испанский</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Невозможно изменить имя инструмента заготовки "%1"'</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="178"/>
-        <source>Swedish</source>
-        <translation>Шведский</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Выберите исполняемый файл инструмента</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="179"/>
-        <source>Ukrainian</source>
-        <translation>Украинский</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation>Выбрать шаблон документа</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Отношения можно выбирать, даже если они скрыты</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation>Merkaartor документ (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Интерфейс</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Выберите директорию для журналов</translation>
     </message>
 </context>
 <context>
@@ -6000,7 +6000,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6036,25 +6036,25 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
         <translation>Невозможно экспортировать в формат PROJ4</translation>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6068,27 +6068,6 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>PropertiesDock</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
-        <source>Properties</source>
-        <translation>Свойства</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
-        <source>Error reading template file</source>
-        <translation>Ошибка при чтении файла шаблона</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
-        <source>Center map</source>
-        <translation>Центр карты</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
-        <source>Center && Zoom map</source>
-        <translation>Центрировать и масштабировать карту</translation>
-    </message>
-    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="339"/>
         <source>%1/%1 selected item(s)</source>
         <translation>выбрано элементов %1/%1</translation>
@@ -6109,9 +6088,9 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Свойства - Разные элементы</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
-        <source>Properties - Relation</source>
-        <translation>Свойства - Отношение</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Свойства - Точка</translation>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
@@ -6119,41 +6098,39 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Свойства - Линия</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
-        <source>Select member</source>
-        <translation>Выделить участника</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="487"/>
+        <source>Properties - Relation</source>
+        <translation>Свойства - Отношение</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Свойства - Точка</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="499"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1157"/>
+        <source>Properties</source>
+        <translation>Свойства</translation>
     </message>
-</context>
-<context>
-    <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation>Экспорт GPX...</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
+        <source>Error reading template file</source>
+        <translation>Ошибка при чтении файла шаблона</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
+        <source>Center map</source>
+        <translation>Центр карты</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1159"/>
+        <source>Center && Zoom map</source>
+        <translation>Центрировать и масштабировать карту</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
+        <source>Select member</source>
+        <translation>Выделить участника</translation>
     </message>
+</context>
+<context>
+    <name>QApplication</name>
     <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
@@ -6180,7 +6157,30 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Переместить точку %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation>Экспорт GPX...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Импорт osmChange</translation>
     </message>
@@ -6190,31 +6190,31 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Импорт NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Импорт NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6230,14 +6230,14 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6267,7 +6267,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6278,12 +6278,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Журнал ошибок GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Невозможнол создать файл журнала GPS: %1.</translation>
     </message>
@@ -6291,17 +6291,17 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>Невозможно присоединить к %1:%2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Журнал ошибок GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Невозможнол создать файл журнала GPS: %1.</translation>
     </message>
@@ -6387,95 +6387,139 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation>< Р А З Д Е Л И Т Е Л Ь ></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
         <translation>Настроить панели</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation>Панели инструментов</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation>Восстановить всё</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>по возрастанию</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation>по убыванию</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
         <translation>Текущая панель действий</translation>
     </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation>< Р А З Д Е Л И Т Е Л Ь ></translation>
+    </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
         <translation>Настроить панель</translation>
     </message>
 </context>
 <context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RelationProperties</name>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
@@ -6493,6 +6537,14 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Удалить выбранные элемент(ы):</translation>
     </message>
     <message>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
+        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="122"/>
         <source>Tags</source>
         <translation>Теги</translation>
@@ -6512,14 +6564,6 @@ Please select another name or click the <Apply> button if you want to modi
         <source>Remove selected tag(s)</source>
         <translation>Удалить выбранные тег(и)</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="84"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="100"/>
-        <location filename="../src/Docks/MinimumRelationProperties.ui" line="167"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
 </context>
 <context>
     <name>RoadProperties</name>
@@ -6600,6 +6644,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Имя</translation>
     </message>
     <message>
+        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
         <translation>Запрос</translation>
@@ -6609,11 +6658,6 @@ Please select another name or click the <Apply> button if you want to modi
         <source>Maximum returned results (0 for all)</source>
         <translation>Максимальные возвращенные результаты (0 для всех)</translation>
     </message>
-    <message>
-        <location filename="../src/Utils/SelectionDialog.ui" line="81"/>
-        <source>Id</source>
-        <translation>Id</translation>
-    </message>
 </context>
 <context>
     <name>SlippyMapWidget</name>
@@ -6626,12 +6670,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -6655,6 +6699,16 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>SyncListDialog</name>
     <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
+        <source>Upload to Openstreetmap</source>
+        <translation>Передать на сервер Openstreetmap</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
+        <source>Please specify a comment for this changeset.</source>
+        <translation>Пожалуйста, напишите комментарий для этого пакета правок.</translation>
+    </message>
+    <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
         <translation>Пожалуйста внимательно ознакомтесь с изменениями, посылаемыми в OSM</translation>
@@ -6669,16 +6723,6 @@ Please select another name or click the <Apply> button if you want to modi
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="13"/>
-        <source>Upload to Openstreetmap</source>
-        <translation>Передать на сервер Openstreetmap</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
-        <source>Please specify a comment for this changeset.</source>
-        <translation>Пожалуйста, напишите комментарий для этого пакета правок.</translation>
-    </message>
 </context>
 <context>
     <name>TMSPreferencesDialog</name>
@@ -6722,7 +6766,7 @@ Please select another name or click the <Apply> button if you want to modi
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -6736,6 +6780,21 @@ p, li { white-space: pre-wrap; }
         <translation>Проекция:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Шир/Дол (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>Начало координат в левом нижнем углу</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
         <translation>Размер мозаики:</translation>
@@ -6761,21 +6820,6 @@ p, li { white-space: pre-wrap; }
         <translation>Ссылка на лицензию:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Шир/Дол (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>Начало координат в левом нижнем углу</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
         <source>Apply</source>
         <translation>Применить</translation>
@@ -6791,24 +6835,18 @@ p, li { white-space: pre-wrap; }
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
         <translation>Merkaartor: GetServices</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Адрес и путь не могуть быть пустыми.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Ошибка скачивания: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Ошибка сервисов чтения.
@@ -6942,61 +6980,61 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Извлечение - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation># сегментов трека</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Общее расстояние</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 км</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Общая продолжительность</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1ч %2м</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Извлечение - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Извлечь редактируемый слой</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -7095,12 +7133,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
@@ -7108,35 +7146,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: ПолучитьВозможности</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Адрес и путь не могуть быть пустыми.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Ошибка скачивания: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Ошибка чтения возможностей.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>Настройки серверов WMS</translation>
@@ -7157,31 +7166,26 @@ p, li { white-space: pre-wrap; }
         <translation>Имя:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
+        <source>Server Url:</source>
+        <translation>Ссылка на сервер:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="113"/>
         <source>Layers:</source>
         <translation>Слои:</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
-        <source>Projection:</source>
-        <translation>Проекция:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
-        <source>Image format:</source>
-        <translation>Формат изображения:</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
-        <source>Styles:</source>
-        <translation>Стили:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
+        <source>1</source>
+        <translation>1</translation>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="144"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
         <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -7190,6 +7194,11 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Это кеширующий WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> сервер& [...]
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
+        <source>Projection:</source>
+        <translation>Проекция:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
         <translation>Разбить на квадраты</translation>
@@ -7200,6 +7209,16 @@ p, li { white-space: pre-wrap; }
         <translation>Уровни масштаба</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
+        <source>Image format:</source>
+        <translation>Формат изображения:</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
+        <source>Styles:</source>
+        <translation>Стили:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
         <translation>значение "исходного" тега:</translation>
@@ -7225,14 +7244,33 @@ p, li { white-space: pre-wrap; }
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="99"/>
-        <source>Server Url:</source>
-        <translation>Ссылка на сервер:</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: ПолучитьВозможности</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="136"/>
-        <source>1</source>
-        <translation>1</translation>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Адрес и путь не могуть быть пустыми.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Ошибка чтения возможностей.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Ошибка скачивания: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_sk.ts b/translations/merkaartor_sk.ts
index 8895bcd..b639cea 100644
--- a/translations/merkaartor_sk.ts
+++ b/translations/merkaartor_sk.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="sk">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,57 +24,57 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished"></translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Tento program je šírený pod licenciou GNU Public License v2</translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Tento program je šírený pod licenciou GNU General Public License v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Zoznam zmien</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -84,98 +82,128 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Skratka</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importovať</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Exportovať</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Predvolené</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Zrušiť</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Nemožno otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 sa nepodarilo otvoriť.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>bez názvu</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Všetky súbory (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 sa nepodarilo otvoriť na zápis.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
         <source>No description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -183,7 +211,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Interactions/CreateDoubleWayDock.ui" line="25"/>
@@ -201,7 +229,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Interactions/CreateRoundaboutDock.ui" line="25"/>
@@ -214,21 +242,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -258,9 +282,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -271,7 +295,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Zväčšenie</translation>
     </message>
@@ -288,7 +312,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="334"/>
         <location filename="../src/Sync/DirtyList.cpp" line="604"/>
         <source>ADD trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="342"/>
@@ -300,25 +324,25 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="350"/>
         <location filename="../src/Sync/DirtyList.cpp" line="701"/>
         <source>UPDATE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="358"/>
         <location filename="../src/Sync/DirtyList.cpp" line="639"/>
         <source>UPDATE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="366"/>
         <location filename="../src/Sync/DirtyList.cpp" line="670"/>
         <source>UPDATE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="374"/>
         <location filename="../src/Sync/DirtyList.cpp" line="734"/>
         <source>REMOVE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="382"/>
@@ -337,7 +361,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="430"/>
         <location filename="../src/Sync/DirtyList.cpp" line="446"/>
         <source>Error uploading request</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="424"/>
@@ -349,13 +373,13 @@ p, li { white-space: pre-wrap; }
         <location filename="../src/Sync/DirtyList.cpp" line="447"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="429"/>
         <source>
 API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyList.cpp" line="464"/>
@@ -380,7 +404,7 @@ API message is '%1'</source>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="71"/>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="85"/>
         <source>Error uploading request</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="65"/>
@@ -391,25 +415,25 @@ API message is '%1'</source>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="68"/>
         <source>There was an error uploading this request (%1)
 Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="70"/>
         <source>
 API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="86"/>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
         <source>Checking changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="184"/>
@@ -434,27 +458,27 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="383"/>
         <source>ADD trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="399"/>
         <source>UPDATE relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="414"/>
         <source>UPDATE road %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="428"/>
         <source>UPDATE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="442"/>
         <source>REMOVE trackpoint %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="456"/>
@@ -470,97 +494,97 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>bez názvu</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Pracovná vrstva</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Nahratá vrstva</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Zobrazovánie pozadia</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -588,12 +612,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -608,249 +632,236 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="119"/>
         <source>Resolve all relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Sťahovanie zlyhalo</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 stiahnuté</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>chyba</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
-        <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Sťahovanie z OSM (%n bytov)</numerusform>
-            <numerusform>Sťahovanie z OSM (%n bytov)</numerusform>
-            <numerusform>Sťahovanie z OSM (%n bytov)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
-        <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Sťahovanie z OSM (%n kBytov)</numerusform>
-            <numerusform>Sťahovanie z OSM (%n kBytov)</numerusform>
-            <numerusform>Sťahovanie z OSM (%n kBytov)</numerusform>
-        </translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
-        <source>Downloading...</source>
-        <translation>Sťahuje sa...</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
-        <source>Downloading from OSM (connecting)</source>
-        <translation>Sťahovanie z OSM (pripájanie)</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
-        <source>Unexpected http status code (%1)
-Server message is '%2'</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
-        <source>
-API message is '%1'</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Konflikty z %1</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <source>Username/password invalid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Unresolved conflicts</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
-        <source>Please resolve existing conflicts first</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>Detekovaný konflikt</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
-        <source>Downloading trackpoints %1-%2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>chyba</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
-        <source>Downloaded track - nodes %1-%2</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
+        <source>Downloading from OSM (%n bytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
+        <source>Downloading from OSM (%n kBytes)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 stiahnuté</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
+        <source>Downloading...</source>
+        <translation>Sťahuje sa...</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
+        <source>Downloading from OSM (connecting)</source>
+        <translation>Sťahovanie z OSM (pripájanie)</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
+        <source>Unexpected http status code (%1)
+Server message is '%2'</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
+        <source>
+API message is '%1'</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Konflikty z %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Sťahovanie zlyhalo</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>Detekovaný konflikt</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <source>Username/password invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Unresolved conflicts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
+        <source>Please resolve existing conflicts first</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
+        <source>Downloading trackpoints %1-%2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
+        <source>Downloaded track - nodes %1-%2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
-        <source>Downloading %1,%2 (zoom %3)...</source>
-        <translation>Sťahovanie %1,%2 (priblíženie %3)...</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
+        <source>Downloading %1,%2 (zoom %3)...</source>
+        <translation>Sťahovanie %1,%2 (priblíženie %3)...</translation>
     </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Zavrieť</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Zväčšenie</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Zavrieť</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -863,7 +874,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="25"/>
         <source>What do you want to export?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ExportDialog.ui" line="38"/>
@@ -886,7 +897,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="430"/>
         <source>Features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="431"/>
@@ -911,7 +922,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="435"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="442"/>
@@ -926,7 +937,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="444"/>
         <source>POI's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.cpp" line="445"/>
@@ -939,22 +950,22 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="14"/>
         <source>Features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="72"/>
         <source>Only features fully within the viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -972,7 +983,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="30"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
@@ -983,7 +994,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Zavrieť</translation>
     </message>
@@ -993,17 +1004,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="47"/>
         <source>Filter list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="76"/>
@@ -1013,7 +1024,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="93"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
@@ -1039,266 +1050,240 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Centrovať mapu</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Kopírovať názov súboru do schránky</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Načítavanie obrázkov ...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Zrušiť nahrávanie</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>Nemožno nájsť obrázok "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Centrovať mapu</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints found for image "%1"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'hodiny,' mm 'minúty a' ss 'sekundy'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>neplatná OSM url</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>Zadaná url je neplatná!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>ňneplatný formát súradníc</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Súradnice musia byť: '<ľavá dĺžka>, <dolná šírka>, <pravá dĺžka>, <vrchná šírka>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Súradnice musia byť: '<stredná šírka>, <stredná dĺžka>, <rozpetie šírky>, <rozpetie dĺžky>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Prejsť na</translation>
@@ -1311,27 +1296,27 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
         <source>lonMin, latMin, lonMax, latMax</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="134"/>
         <source>latCent, lonCent, latSpan, lonSpan</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="156"/>
@@ -1354,228 +1339,156 @@ Do you still want to use it?</source>
         <source>Search</source>
         <translation>Hľadať</translation>
     </message>
-</context>
-<context>
-    <name>ImageLayerWidget</name>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
-        <source>Shape adapter</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>neplatná OSM url</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
-        <source>Zoom</source>
-        <translation>Zväčšenie</translation>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>Zadaná url je neplatná!</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
-        <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>ňneplatný formát súradníc</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Súradnice musia byť: '<ľavá dĺžka>, <dolná šírka>, <pravá dĺžka>, <vrchná šírka>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Súradnice musia byť: '<stredná šírka>, <stredná dĺžka>, <rozpetie šírky>, <rozpetie dĺžky>'</translation>
+    </message>
+</context>
+<context>
+    <name>ImageLayerWidget</name>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
+        <source>Shape adapter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
+        <source>Zoom</source>
+        <translation>Zväčšenie</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
+        <source>Set view projection to layer's</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Zavrieť</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Map - Prázdna</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Mapa - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Mapa - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Mapa - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Veľkosť dlaždice</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Zemepisná dĺžka</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Zemepisná šírka</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Chybná projekcia</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Chybný súbor</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 sa nepodarilo otvoriť.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>bez názvu</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Všetky súbory (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 sa nepodarilo otvoriť na zápis.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
@@ -1583,14 +1496,14 @@ Do you really want to exit?</source>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
         <source>Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1598,135 +1511,233 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
         <source>Specifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
         <source>First line contains headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
         <source>Delimiter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
         <source>Colon (,)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="131"/>
         <source>Semicolon (;)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="138"/>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="145"/>
         <source>Other:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
         <source>Projection (in PROJ4 format; leave blank for latitude/longitude)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="227"/>
         <source>Fields</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="254"/>
         <source>Field list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
         <source>Field Type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="310"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="336"/>
         <source>Import range</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="342"/>
         <source>From (0 from start):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="352"/>
         <source>To (0 to End):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="367"/>
         <source>Load settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="374"/>
         <source>Save settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Zemepisná dĺžka</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Zemepisná šírka</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Chybná projekcia</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Chybný súbor</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 sa nepodarilo otvoriť.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>bez názvu</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Všetky súbory (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 sa nepodarilo otvoriť na zápis.</translation>
     </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1740,24 +1751,20 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n vlastnosť</numerusform>
-            <numerusform>%n vlastností</numerusform>
-            <numerusform>%n vlastností</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Veľkosť</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1777,12 +1784,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="255"/>
         <source>Readonly All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="260"/>
         <source>Readonly None</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="267"/>
@@ -1802,81 +1809,81 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
         <source>Tracks</source>
         <translation>Skladby</translation>
     </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Nepriehladnosť</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1884,17 +1891,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1908,2585 +1915,2632 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Zmazať Značku '%1' na %2</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Odstrániť člena '%1' na %2</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Nápoveda</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Vytvoriť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Vytvoriť plochu %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Cesta</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Plocha: Vytvor cestu %1</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Upraviť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Pridať otvor.</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Zobraziť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Chcete pridať (ďalšiu) dieru do tejto plochy?</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Záložky</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Area: Ukonči cestu %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Nastaviť &projekciu</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Plocha: Pridaj bod %1 k ceste %2</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Súbor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Exportovať</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Pos&ledne otvprené</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Vytvoriť dvojitú cestu %1</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Posle&dne importované</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>Nástr&oje</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Vytvoriť bod v ceste: %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Štýl</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Bod</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Okno</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Vytvoriť polygon %1</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Panely</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Vytvoriť kruhový objazd %1</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Vrstvy</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Vytvoriť bod %1 v ceste %2</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&Gps</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Vytvoriť cestu: %1</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Vytvoriť bod: %1</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Pridať bod %1 do cesty %2</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Zobraziť smerové &Šípky</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Ukončiť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&O programe</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Otvoriť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Vytvoriť nový dokument a importovať súbor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Zobraziť &všetko</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Zobraziť &výber</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Zobraziť výber</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Posunúť body</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Posunúť bod %1</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>&Odialiť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>Priblíž&iť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Zlúčiť body do %1</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Priblížiť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Späť</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Opakovať</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Vlastnosti...</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Presunúť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Nemožno načítať súbor projekcií</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importovať</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importovať súbor do aktuálneho dokumentu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Stiahnuť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Stiahnuť mapové údaje pre novú oblasť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Vytvoriť odkaz</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Vybrať</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Nahrať</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Nahrať zmeny na server</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>O&dstrániť</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Vytvoriť novú cestu</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Vytvoriť nový bod</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Otočiť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Vrstvy</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Prejsť na...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Bod</translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Väzba</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Vytvoriť kruhový objazd</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Nástroje</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Nový</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Vytvoriť nový dokument</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Rozdeliť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Neplatná schránka</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Schránka neobsahuje platné dáta</translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Spojiť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Neuložené zmeny</translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Spojiť pripojené cesty do jednej cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>&Rozdeliť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Prerušiť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Cestné body</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Oddeliť pripojené cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&lácia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Vytvoriť Väzbu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Plocha</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 sa nepodarilo otvoriť.</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Vytvoriť novú plochu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Upraviť...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Uložiť &ako...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Načítať...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Zakrivená cesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Nastavenia...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Všetko...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Exportovať všteky viditelné vrstvy do súboru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Nájsť...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Hľadať</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Zobrazenie...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Pridať...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Vytvoriť polygon</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Odstránit...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Zlúčiť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Spoj cesty</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Uložiť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Uložiť do súboru</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Stiahnuť viac</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Stiahnuť viac mapových dát pre aktuálnu oblasť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Stiahnuť aktuálny pohlad do predchádzajúcej stiahnutej vrstvy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Vytvotiť križovatku</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Vlastnosti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Skryť/Zobraziť panel Vlastností</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Pridať čísla domov</translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Skryť/Zobraziť panel Vrstiev</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Informácie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Skryť/Zobraziť Info panel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Zarovnať</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Zarovnať Body</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Zarovnať vybrané body. Prvé dva vybrabé definujú priamku.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Skryť/Zobraziť panel Histórie zmien</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Zobraziť &stiahnutú  oblasť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Kopírovať</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Zarovnať Body</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Kopírovať vybrané vlastnosti a značky do schránky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Odpojiť bod: %1</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Pridať člena do väzby</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Vložiť značky (P&repísať)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Odstrániť člena z väzby</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Vložiť značky (Zlúč&iť)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Vložiť značky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Vložiť značky zo schránky (Zlúčiť s existujúcimi značkami)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Vytvoriť Väzbu %1</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Označené...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Podporované formáty</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Vložiť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>OpenStreetMap format (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (Binárne)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>KML súbor (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Vnútiť Nahratie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Previesť vlastnosti do pracovnej vrstvy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Previesť vybranú vlastnosť z pomocných vrstiev (napr. Trate alebo Extrakt) do pracovnej vrstvy, pripraviť pre nahratie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Panel nástrojov</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Merkaartor dokument (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Skryť/Zobraziť nástrojovú lištu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Cesta</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Schovať všetko</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Zobraziť všetko</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>&Obrázková vrstva</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Zrušiť</translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Uložiť Merkaartor dokument</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Štart</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>bez názvu</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Všetky súbory (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Prehrať...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Skryť/Zobraziť GPS panel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 sa nepodarilo otvoriť na zápis.</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Chybný súbor</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 nie je platný dokument Merkaatora.</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centrovať na GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Exportovať OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>OSM Súbory (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Zobraziť mierku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Exportovať GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Zobraziť &väzby</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPX Súbory (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exportovať KML</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KML Súbory (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (celočís.)</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pauza</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Pridať záložku</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Neplatné meno záložky</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Záložka nemôže byť prázdna.</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Editor skratiek...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Odstrániť záložku</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Zlúčiť...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Označiť záložku na odstránenie</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Uložiť...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Chybná projekcia</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Pridat člena</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Nemožno nastaviť projekciu "%1".</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Odstrániť člena</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>GPS chyba</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&Nikdy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>pre &Jednosmerné cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Vždy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Uložiť šablóny značiek</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>O&dpojiť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Odpojiť bod z cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Otvoriť šablóny značiek</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Odpojiť bod z cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Pracovať offline</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Nápoveda</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Štýly</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Vytvoriť</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Skryť/Zobraziť panel Štýlov</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Cesta</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Upraviť</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Zobraziť</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Záložky</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Nastaviť &projekciu</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>GPS Menu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Zobraziť smerové &Šípky</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Kamera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Vytvotiť &križovatku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Súbor</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Otáčať</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Exportovať</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Pos&ledne otvprené</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Posle&dne importované</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>Nástr&oje</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Štýl</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Bod</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Pridať &čísla domov (Karlsruhe scheme)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Okno</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Panely</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Vrstvy</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&Gps</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Ukončiť</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&O programe</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Otvoriť</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Vytvoriť nový dokument a importovať súbor</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Zavrieť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Zobraziť &všetko</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Zobraziť &výber</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Zobraziť výber</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>&Odialiť</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>Priblíž&iť</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Priblížiť</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Späť</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Opakovať</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Presunúť</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importovať</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importovať súbor do aktuálneho dokumentu</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Stiahnuť</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Vlastnosti...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Stiahnuť mapové údaje pre novú oblasť</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Vytvoriť odkaz</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Vybrať</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Nahrať</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Nahrať zmeny na server</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>O&dstrániť</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Vytvoriť novú cestu</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Vytvoriť nový bod</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Otočiť</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Prejsť na...</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Stiahnuť chýbajúce deti</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Vytvoriť kruhový objazd</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Nový</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Zmazať Značku '%1' na %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Vytvoriť nový dokument</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Rozdeliť</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Odstrániť člena '%1' na %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Spojiť</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Spojiť pripojené cesty do jednej cesty</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Vytvoriť bod v ceste: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>&Rozdeliť</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Prerušiť</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Vytvoriť plochu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Oddeliť pripojené cesty</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Plocha: Vytvor cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Pridať otvor.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&lácia</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Chcete pridať (ďalšiu) dieru do tejto plochy?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Vytvoriť Väzbu</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Area: Ukonči cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Plocha</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Plocha: Pridaj bod %1 k ceste %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Vytvoriť novú plochu</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Upraviť...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Uložiť...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Načítať...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Vytvoriť dvojitú cestu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Zakrivená cesta</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Nastavenia...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Všetko...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Vytvoriť polygon %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Exportovať všteky viditelné vrstvy do súboru</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Nájsť...</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Vytvoriť kruhový objazd %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Hľadať</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Vytvoriť bod %1 v ceste %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Zobrazenie...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Vytvoriť cestu: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Vytvoriť bod: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Pridať...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Pridať bod %1 do cesty %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Odstránit...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Zlúčiť</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Uložiť &ako...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Uložiť</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Zmazať deti.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Uložiť do súboru</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Stiahnuť viac</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Stiahnuť viac mapových dát pre aktuálnu oblasť</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Stiahnuť aktuálny pohlad do predchádzajúcej stiahnutej vrstvy</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Posunúť body</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Vlastnosti</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Posunúť bod %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Skryť/Zobraziť panel Vlastností</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Skryť/Zobraziť panel Vrstiev</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Zlúčiť body do %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Informácie</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Skryť/Zobraziť Info panel</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Zarovnať</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Zarovnať Body</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Zarovnať vybrané body. Prvé dva vybrabé definujú priamku.</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>OpenStreetMap format (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Skryť/Zobraziť panel Histórie zmien</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Zobraziť &stiahnutú  oblasť</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>KML súbor (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopírovať</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Kopírovať vybrané vlastnosti a značky do schránky</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Vložiť značky (P&repísať)</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Podporované formáty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Merkaartor dokument (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Všetky súbory (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Vložiť značky (Zlúč&iť)</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Vložiť značky</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Nemožno načítať súbor projekcií</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Vložiť značky zo schránky (Zlúčiť s existujúcimi značkami)</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Označené...</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Bod</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Väzba</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Vrstvy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Nástroje</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Neplatná schránka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Stiahnuť chýbajúce deti</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Schránka neobsahuje platné dáta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Neuložené zmeny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Cestné body</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Vložiť</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 sa nepodarilo otvoriť.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (Binárne)</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Vnútiť Nahratie</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Previesť vlastnosti do pracovnej vrstvy</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Previesť vybranú vlastnosť z pomocných vrstiev (napr. Trate alebo Extrakt) do pracovnej vrstvy, pripraviť pre nahratie</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Panel nástrojov</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Skryť/Zobraziť nástrojovú lištu</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Schovať všetko</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Zobraziť všetko</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>&Obrázková vrstva</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Vytvoriť polygon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Spoj cesty</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Vytvotiť križovatku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Pridať čísla domov</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Štart</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Prehrať...</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Skryť/Zobraziť GPS panel</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Zarovnať Body</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Odpojiť bod: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centrovať na GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Pridať člena do väzby</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Odstrániť člena z väzby</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Zobraziť mierku</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Zobraziť &väzby</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Vytvoriť Väzbu %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pauza</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>bez názvu</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Uložiť Merkaartor dokument</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Editor skratiek...</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Zlúčiť...</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 sa nepodarilo otvoriť na zápis.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Pridat člena</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Odstrániť člena</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Chybný súbor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&Nikdy</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 nie je platný dokument Merkaatora.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>pre &Jednosmerné cesty</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Exportovať OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Vždy</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>OSM Súbory (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>O&dpojiť</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Odpojiť bod z cesty</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Odpojiť bod z cesty</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Exportovať GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Pracovať offline</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPX Súbory (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Exportovať KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Štýly</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KML Súbory (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Skryť/Zobraziť panel Štýlov</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>GPS Menu</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (celočís.)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Pridať záložku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Vytvotiť &križovatku</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Otáčať</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Neplatné meno záložky</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Záložka nemôže byť prázdna.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Pridať &čísla domov (Karlsruhe scheme)</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Odstrániť záložku</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Označiť záložku na odstránenie</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Chybná projekcia</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Nemožno nastaviť projekciu "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>GPS chyba</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Uložiť šablóny značiek</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Zavrieť</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Otvoriť šablóny značiek</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Zmazať deti.</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Unresolved conflicts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Please resolve existing conflicts first</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
         <source>It is strongly recommended to save the changes to your document after an upload.
 Do you want to do this now?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="131"/>
         <location filename="../src/common/TagModel.cpp" line="162"/>
         <source>Set Tags on multiple features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TagModel.cpp" line="133"/>
@@ -4494,219 +4548,183 @@ Do you want to do this now?</source>
         <source>Set Tags on %1</source>
         <translation>Nastaviť značku na %1</translation>
     </message>
+</context>
+<context>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
+        <source><i>V: </i><b>%1</b> </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
+        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
+        <translation><i>posledný: </i><b>%1</b&gt; od <b>%2</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>posledné: </i><b>%1</b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
+        <source><br/><i>layer: </i><b>%1</b> </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Cestný bod</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
-        <source><i>V: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>popis</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
-        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>posledný: </i><b>%1</b&gt; od <b>%2</b&gt;</translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>komentár</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>posledné: </i><b>%1</b&gt;</translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Bod</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
-        <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>výška</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>rýchlosť</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>veľkosť</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>Lavý horný</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Väzba</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Úloha</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Člen</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Dľžka</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Veľkosť</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
-        <translation>%1 bodov</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Area</source>
-        <translation>Plocha</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>výška</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>rýchlosť</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>popis</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>komentár</translation>
+        <translation>%1 bodov</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Cestný bod</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Area</source>
+        <translation>Plocha</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Bod</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="351"/>
         <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4718,20 +4736,30 @@ Do you want to do this now?</source>
         <translation>Nová záložka</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Duplikovať klúč</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
@@ -4747,7 +4775,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="33"/>
@@ -4762,23 +4790,23 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/common/MultiProperties.ui" line="73"/>
         <source>Selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Meno</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Neznáme pole</translation>
     </message>
@@ -4791,24 +4819,9 @@ Do you want to do this now?</source>
         <translation>Chyba!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Neznáma chyba.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4816,7 +4829,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/NameFinder/namefinderwidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4826,12 +4839,7 @@ Do you want to do this now?</source>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>Output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
@@ -4842,6 +4850,11 @@ Do you want to do this now?</source>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4863,32 +4876,32 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
         <source>min lat/Lon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="90"/>
         <source>max lat/Lon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
@@ -4898,27 +4911,27 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4926,12 +4939,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="25"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="35"/>
@@ -4947,34 +4960,15 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Vždy</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="20"/>
@@ -5004,9 +4998,34 @@ Do you want to do this now?</source>
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
@@ -5037,7 +5056,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="383"/>
         <source>Visible up to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="390"/>
@@ -5052,31 +5071,6 @@ Do you want to do this now?</source>
         <translation>Kresliť s farbou</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5086,7 +5080,7 @@ Do you want to do this now?</source>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="628"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1139"/>
         <source>off</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="665"/>
@@ -5096,7 +5090,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5106,22 +5100,22 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
         <source>Touchup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="981"/>
         <source>Draw steps</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1176"/>
@@ -5131,290 +5125,149 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
         <source>Label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1370"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1417"/>
         <source>Label tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1533"/>
         <source>Halo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
-        <source>Area</source>
-        <translation>Plocha</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
-        <source>Draw with background color</source>
-        <translation>Kresliť s podkladovou farbou</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
-        <source>Label with background tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PhotoLoadErrorDialog</name>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
-        <source>No Valid geotag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
-        <source>This photo does not contain geo-tagging EXIF data.
-What do you want to do next?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
-        <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
-        <source>Load without associated node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
-        <source>Extract info from barcode (Walking Papers)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
-        <source>Ignore it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
-        <source>Do this for all current photos.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PictureViewerDialog</name>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Output filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVG súbory (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>untitled</source>
-        <translation>bez názvu</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Všetky súbory (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation>obrázkové súbory (*.png *.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>Anglický</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Arabský</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Český</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>Nemecký</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>Francúzsky</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Talianský</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation>Poľský</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Ruský</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Adresár uživateľských štýlov</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1543"/>
+        <source>Area</source>
+        <translation>Plocha</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Šablóna značky</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1592"/>
+        <source>Draw with background color</source>
+        <translation>Kresliť s podkladovou farbou</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1648"/>
+        <source>Label with background tag</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Vždy</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
         <source>Select Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PhotoLoadErrorDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Nástroj už existuje</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
+        <source>No Valid geotag</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Nástroj s týmto menom už existuje.
-Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chcete zmeniť</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Nemožno vymazať predvolený nástroj</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
+        <source>This photo does not contain geo-tagging EXIF data.
+What do you want to do next?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Nemožno vymazať predvolený nástroj "%1"</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
+        <source>Try to match with a track node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Nemožno pozmeniť meno predvoleného nástroja</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
+        <source>Load without associated node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Nemožno pozmeniť meno predvoleného nástroja "%1"</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
+        <source>Extract info from barcode (Walking Papers)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
+        <source>Ignore it</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
+        <source>Do this for all current photos.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PictureViewerDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
-        <source>Preferences</source>
-        <translation>Nastavenia</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>untitled</source>
+        <translation>bez názvu</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Lokalizácia</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>SVG súbory (*.svg)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>Všetky súbory (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Používať jazyk</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation>obrázkové súbory (*.png *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
+        <source>Preferences</source>
+        <translation>Nastavenia</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
@@ -5424,27 +5277,22 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="34"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="42"/>
         <source>Zoom Out/in (%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="66"/>
         <source>Opacity low/high</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="104"/>
@@ -5452,9 +5300,24 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <translation>Použiť vlastný Qt štýl</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
         <source>Use Virtual nodes (new session required)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
@@ -5488,9 +5351,9 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <translation>Prepísať štýl</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5500,163 +5363,190 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <location filename="../src/Preferences/PreferencesDialog.ui" line="462"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="529"/>
         <source>Pixels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Zvýraznenie</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Výber</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Väzby</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
         <source>Use simple GPX track appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Aktuálny štýl</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Šablóna</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Zabudovaný</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Väzby</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Uživateľský</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Výber</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Údaje</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Zvýraznenie</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Heslo:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Lokalizácia</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Dokumenty</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Používať jazyk</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Adresár uživateľských štýlov</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Aktuálny štýl</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Šablóna</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Šablóna značky</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Zabudovaný</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Uživateľský</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Údaje</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Dokumenty</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
@@ -5671,27 +5561,27 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1022"/>
         <source>Automatically extract tracks on open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1029"/>
         <source>Track layers readonly by default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1040"/>
         <source>Don't connect GPX nodes separated by more than (in km; 0 to disable)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5701,7 +5591,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
         <source>GPS input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
@@ -5711,28 +5601,28 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
         <source>Serial</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
         <source>Host</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1237"/>
         <source>Set system time to GPS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1258"/>
@@ -5750,6 +5640,11 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <translation>Použiť proxy</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
         <source>User:</source>
         <translation>Užívateľ:</translation>
@@ -5757,22 +5652,22 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1307"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1314"/>
         <source>Host:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
         <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
@@ -5782,7 +5677,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1430"/>
         <source>Tiles Caching (not active for Yahoo! due to legal restrictions)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1436"/>
@@ -5797,12 +5692,12 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1465"/>
         <source>Map Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
@@ -5835,16 +5730,76 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <translation>Odstrániť</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>Anglický</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Arabský</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Český</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
         <source>Dutch</source>
         <translation>Holandský</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>Nemecký</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>Francúzsky</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Talianský</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation>Poľský</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
         <source>Portuguese</source>
         <translation>Portugalský</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Ruský</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
         <source>Slovak</source>
         <translation>Slovenský</translation>
@@ -5865,14 +5820,66 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <translation>Ukrajinský</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Nástroj už existuje</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Nástroj s týmto menom už existuje.
+Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chcete zmeniť</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Nemožno vymazať predvolený nástroj</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Nemožno vymazať predvolený nástroj "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Nemožno pozmeniť meno predvoleného nástroja</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Nemožno pozmeniť meno predvoleného nástroja "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5880,17 +5887,17 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="14"/>
         <source>Projections setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="20"/>
         <source>Projections</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="47"/>
         <source>Projection list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="76"/>
@@ -5900,7 +5907,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="93"/>
         <source>PROJ4 string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
@@ -5925,7 +5932,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5933,7 +5940,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5946,40 +5953,40 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6005,12 +6012,17 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="425"/>
         <source>Selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="434"/>
         <source>Properties - Multiple elements</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
@@ -6031,7 +6043,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
@@ -6046,43 +6058,15 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1160"/>
         <source>Select member</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Zrušiť</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Commands/FeatureCommands.cpp" line="66"/>
@@ -6105,9 +6089,32 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <translation>Posunúť bod %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportNGT.cpp" line="21"/>
@@ -6115,31 +6122,31 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <translation>Importovať NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importovať NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6155,14 +6162,14 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6192,7 +6199,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6203,32 +6210,32 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6242,7 +6249,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="22"/>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="29"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="63"/>
@@ -6278,7 +6285,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="121"/>
         <source>Fix Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="131"/>
@@ -6288,7 +6295,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="138"/>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgpsmainwindowui.ui" line="148"/>
@@ -6306,98 +6313,142 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/NameFinder/xmlstreamreader.cpp" line="45"/>
         <source>Not a proper results stream!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Odstrániť</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Použiť</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6405,7 +6456,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="31"/>
@@ -6415,7 +6466,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
@@ -6433,17 +6484,17 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6451,7 +6502,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="34"/>
@@ -6471,17 +6522,17 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6494,7 +6545,7 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/GPS/SatelliteStrengthView.cpp" line="50"/>
         <source>No satellites</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6532,12 +6583,12 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6545,18 +6596,18 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="277"/>
         <source>Reset view</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Zavrieť</translation>
     </message>
@@ -6587,12 +6638,12 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="25"/>
         <source>Please specify a comment for this changeset.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="35"/>
         <source>Please review carefully the changes sent to OSM</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/SyncListDialog.ui" line="66"/>
@@ -6610,17 +6661,17 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="14"/>
         <source>TMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="20"/>
         <source>TMS Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="47"/>
         <source>Server list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="78"/>
@@ -6635,21 +6686,21 @@ Prosím vyberte iné meno alebo použite <Apply> tlačítko, pokial ho chc
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="111"/>
         <source>Get Services</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="133"/>
         <source>Services :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="143"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
@@ -6657,44 +6708,44 @@ p, li { white-space: pre-wrap; }
         <translation>Projekcia:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
@@ -6712,27 +6763,21 @@ p, li { white-space: pre-wrap; }
         <translation>Odstrániť</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Adresa a cesta nemôžu byť prázdne.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Sťahovanie zlyhalo: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6758,22 +6803,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
         <source>AND</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6783,12 +6828,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6812,111 +6857,111 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
         <source>For example "1-9;15-17;19,19A"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
         <source>All numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Zväčšenie</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Zavrieť</translation>
     </message>
@@ -6926,7 +6971,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="14"/>
         <source>Trackpoint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="34"/>
@@ -6956,17 +7001,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7004,7 +7049,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="88"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/UploadMapDialog.ui" line="104"/>
@@ -7015,12 +7060,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Zväčšenie</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Zmazať</translation>
     </message>
@@ -7028,37 +7073,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adresa a cesta nemôžu byť prázdne.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Sťahovanie zlyhalo: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="20"/>
@@ -7068,7 +7085,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="47"/>
         <source>Server list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="78"/>
@@ -7095,9 +7112,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
@@ -7107,17 +7124,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
         <source>Zoom levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
         <source>Image format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
@@ -7127,12 +7144,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7149,5 +7166,33 @@ p, li { white-space: pre-wrap; }
         <source>Remove</source>
         <translation>Odstrániť</translation>
     </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Adresa a cesta nemôžu byť prázdne.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Sťahovanie zlyhalo: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_sv.ts b/translations/merkaartor_sv.ts
index 731712b..094e41c 100644
--- a/translations/merkaartor_sv.ts
+++ b/translations/merkaartor_sv.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="sv">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,57 +24,57 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished">Upphovsrätt Bart Vanhauwaert, Chris Browet med flera, 2006-2012</translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Detta program är licenserat med GNU Public License v2</translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Detta program är licenserat med GNU General Public License v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Ändringslogg</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -84,93 +82,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Kortkommando</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Importera</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Exportera</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>&Förvald</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Redigerare för kortkommandon</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Ladda shema för genvägar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Merkaartor shema för genvägar (*mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Kan inte öppna filen</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 kunde inte öppnas</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Spara shema för genvägar</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>namnlös</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Alla filer (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Kan inte öppna sparad fil</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 kunde inte öppnas för skrivning</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -214,20 +242,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -257,9 +282,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -270,7 +295,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Zooma</translation>
     </message>
@@ -475,97 +500,97 @@ Vänligen ladda ner de objekt som har problem igen för att lösa konfilkten.</t
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>namnlös</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Skräplager</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Ladda upp lager</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Bakgrundsbilder</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
         <translation>OSM export</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
         <translation>Exportera OSM...</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -593,12 +618,12 @@ Vänligen ladda ner de objekt som har problem igen för att lösa konfilkten.</t
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -619,246 +644,235 @@ Vänligen ladda ner de objekt som har problem igen för att lösa konfilkten.</t
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Nerladdning misslyckades</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 nedladdat</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>fel</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Nedladdning olöst...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Nedladdning olöst %1 av %2</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Analys olöst %1 av %2</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Tolkar...</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>Tolkar XML</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Konflikter från %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Tomma vägar/relationer upptäckta</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Tomma vägar/relationer är troligen felaktiga.
+Vill du markera de för borttagning?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Ta bort tomma tecken %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>Konflikter har upptäckts</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation>Detta innebär att några av tecknen du ändrade sedan senaste nedladdningen har modifierats av någon annan på servern.
+Tecknen har duplicerats som "coflict_..." på "Conflicts..." lagret.
+Före du kan ladda upp dina ändrngar måste du manuellt sammanfoga de två versionerna och ta bort den från "Conflicts..." lagret.</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Laddar upp...</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation>Förbereder ändringar</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation>Väntar på kontakt från servern</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>laddade inte ner tillräckligt</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>fel</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Laddar ner från OSM (%n byte)</numerusform>
-            <numerusform>Laddar ner från OSM (%n byte)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Laddar ner från OSM (%n kilobyte)</numerusform>
-            <numerusform>Laddar ner från OSM (%n kilobytes)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
         <source>Downloading...</source>
         <translation>Laddar ner...</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
         <source>Downloading from OSM (connecting)</source>
         <translation>Laddar ner från OSM (ansluter)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation>Oväntad http statuskod (%1)
 Meddelande från server: '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 API-meddelande är '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Nerladdning misslyckades</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
         <source>Username/password invalid</source>
         <translation>Användarnamn/lösenord ogiltigt</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Unresolved conflicts</source>
         <translation>Olösta konflikter</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Please resolve existing conflicts first</source>
         <translation>Lös först alla konflikter</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation>Laddar ner punkter</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Tolkar...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>Tolkar XML</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
         <source>Downloading trackpoints %1-%2</source>
         <translation>Ladda ner spårpunkter %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
         <source>Downloaded track - nodes %1-%2</source>
         <translation>Ladda ner spår - noder %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 nedladdat</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Nedladdning olöst...</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Nedladdning olöst %1 av %2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Analys olöst %1 av %2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Konflikter från %1</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>Konflikter har upptäckts</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation>Detta innebär att några av tecknen du ändrade sedan senaste nedladdningen har modifierats av någon annan på servern.
-Tecknen har duplicerats som "coflict_..." på "Conflicts..." lagret.
-Före du kan ladda upp dina ändrngar måste du manuellt sammanfoga de två versionerna och ta bort den från "Conflicts..." lagret.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Tomma vägar/relationer upptäckta</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Tomma vägar/relationer är troligen felaktiga.
-Vill du markera de för borttagning?</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation>Laddar ner punkter</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Ta bort tomma tecken %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
         <source>Downloading %1,%2 (zoom %3)...</source>
         <translation>Laddar ner %1, %2 (zoom %3)...</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Laddar upp...</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation>Förbereder ändringar</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation>Väntar på kontakt från servern</translation>
-    </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Stäng</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Zooma</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Stäng</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -991,7 +1005,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
@@ -1047,233 +1061,233 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation>Tidsgräns för nätverk</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation>Kan inte hämta fotots detaljer från Walking Papers server</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation>Ange URL för Walking Papers</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Geobilder</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Centrera karta</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Ta bort bilder</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Kopiera filnamn från urklipp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
         <translation>Välj nästa bild</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
         <translation>Sida ner</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
         <translation>Välj föregående bild</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
         <translation>Sida upp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation>Spara geotaggade bilder...</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation>Fotolager</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Ladda geotaggade bilder</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>Välj vilket lager som bilderna tillhör:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Laddade bilder ...</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Avbryt laddning</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation>Ingen sådan fil</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>Kan inte hitta bild "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation>Fel vid öppnande av "%2":
 %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
         <translation>Fel vid laddande av EXIF-data från "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation>Tidsgräns för nätverk</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
+        <source>Specify offset</source>
+        <translation>Ange offset</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation>Kan inte hämta fotots detaljer från Walking Papers server</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
+        <source>Position images more to the:</source>
+        <translation>Placera bilderna mera till:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation>Ange URL för Walking Papers</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
+        <source>end of the track</source>
+        <translation>slut på spåret</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
+        <source>beginning of the track</source>
+        <translation>början på spåret</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Centrera karta</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
+        <source>hh:mm:ss</source>
+        <translation>hh:mm:ss</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints</source>
+        <translation>Inga spårpunkter</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation>Spara geotaggade bilder...</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
+        <source>No TrackPoints found for image "%1"</source>
+        <translation>Inga spårpunkter funna för bilden "%1"</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation>Fotolager</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
-        <source>Specify offset</source>
-        <translation>Ange offset</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
-        <source>Position images more to the:</source>
-        <translation>Placera bilderna mera till:</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
-        <source>end of the track</source>
-        <translation>slut på spåret</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
-        <source>beginning of the track</source>
-        <translation>början på spåret</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
-        <source>hh:mm:ss</source>
-        <translation>hh:mm:ss</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints</source>
-        <translation>Inga spårpunkter</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
-        <source>No TrackPoints found for image "%1"</source>
-        <translation>Inga spårpunkter funna för bilden "%1"</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>ss 'sekunder'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>mm 'minuter och' ss 'sekunder'</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>hh 'timmar,' mm 'minuter och' ss 'sekunder</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>Fel bild?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Bild "%1" togs %2 innan nästa spårpunkt registrerades.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Bild "%1" togs %2 efter den sista spårpunkten registrerades.</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation>JPEG bilder (*.jpg)</translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation>JPEG bilder (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Fel vid öppnade av "%1":
@@ -1283,32 +1297,6 @@ Do you still want to use it?</source>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Ogiltig URL för OSM</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>Den angivna URLen är ogiltig</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Ogiltigt format på koordinater</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Koordinater måste vara på formatet: '<vänster lon>, <nedre lat>, <höger lon>, <övre lat>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Koordinater måste vara på formatet: '<center lat>, <center lon>, <omf lat>, <omf lon>'</translation>
-    </message>
-    <message>
         <location filename="../src/common/GotoDialog.ui" line="14"/>
         <source>Go To</source>
         <translation>Gå till</translation>
@@ -1321,17 +1309,17 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1364,123 +1352,149 @@ Do you still want to use it?</source>
         <source>Search</source>
         <translation>Sök</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Ogiltig URL för OSM</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>Den angivna URLen är ogiltig</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Ogiltigt format på koordinater</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Koordinater måste vara på formatet: '<vänster lon>, <nedre lat>, <höger lon>, <övre lat>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Koordinater måste vara på formatet: '<center lat>, <center lon>, <omf lat>, <omf lon>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Formadapter</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Zooma</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>WMS-adapter</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>TMS adapter</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Karta - Ingen</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Karta - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
         <translation>Karta - WMS-C - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
         <translation>Karta - WMS-Tiled - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Karta - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Karta - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Rutstorlek</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Projektion</translation>
     </message>
@@ -1488,105 +1502,6 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Textsträng</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Heltal</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation>Flyttal</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Longitud</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Latitud</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Ogiltig kartprojektion</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation>Kan inte ställa in projektion</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation>Inga koordinater</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation>Fält för latitud eller longitud saknas. Det kommer inte vara möjligt att läsa in filen.
-Vill du verkligen avsluta?</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation>Ladda CSV importinställningar</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation>Merkaartor importinställningar (*.mis)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Ogiltig fil</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 kunde inte öppnas</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation>%1 är inte en giltig fil för CSV import</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation>Spara CSV importinställningar</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>namnlös</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Alla filer (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation>Kan inte öppna spara importinställning</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 kunde inte öppnas för skrivning</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialogruta</translation>
@@ -1601,7 +1516,7 @@ Vill du verkligen avsluta?</translation>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1609,7 +1524,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
@@ -1654,7 +1569,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1664,12 +1579,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
@@ -1684,17 +1599,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="254"/>
         <source>Field list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
         <source>Field Type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="310"/>
@@ -1726,67 +1641,163 @@ p, li { white-space: pre-wrap; }
         <source>Save settings...</source>
         <translation>Spara inställningar...</translation>
     </message>
-</context>
-<context>
-    <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
-        <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Textsträng</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
-        <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Heltal</translation>
     </message>
-</context>
-<context>
-    <name>InfoDock</name>
     <message>
-        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
-        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
-        <source>Info</source>
-        <translation>Info</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation>Flyttal</translation>
     </message>
-</context>
-<context>
-    <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n egenskap</numerusform>
-            <numerusform>%n egenskaper</numerusform>
-        </translation>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Longitud</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>Size</source>
-        <translation>Storlek</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Latitud</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
-        <source>Features</source>
-        <translation>Tecken</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Ogiltig kartprojektion</translation>
     </message>
-</context>
-<context>
-    <name>LayerDock</name>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
-        <source>Show All</source>
-        <translation>Visa alla</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation>Kan inte ställa in projektion</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
-        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
-        <source>Hide All</source>
-        <translation>Dölj alla</translation>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation>Inga koordinater</translation>
     </message>
     <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
-        <source>Readonly All</source>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation>Fält för latitud eller longitud saknas. Det kommer inte vara möjligt att läsa in filen.
+Vill du verkligen avsluta?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation>Ladda CSV importinställningar</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation>Merkaartor importinställningar (*.mis)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Ogiltig fil</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 kunde inte öppnas</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation>%1 är inte en giltig fil för CSV import</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation>Spara CSV importinställningar</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>namnlös</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Alla filer (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation>Kan inte öppna spara importinställning</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 kunde inte öppnas för skrivning</translation>
+    </message>
+</context>
+<context>
+    <name>ImportExportGdal</name>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
+        <source>Confirm projection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
+        <source>Unable to set projection; please specify one</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InfoDock</name>
+    <message>
+        <location filename="../src/Docks/InfoDock.cpp" line="24"/>
+        <location filename="../src/Docks/InfoDock.cpp" line="96"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
+    <name>Layer</name>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>Size</source>
+        <translation>Storlek</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
+        <source>Features</source>
+        <translation>Tecken</translation>
+    </message>
+</context>
+<context>
+    <name>LayerDock</name>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="243"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="352"/>
+        <source>Show All</source>
+        <translation>Visa alla</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="248"/>
+        <location filename="../src/Docks/LayerDock.cpp" line="356"/>
+        <source>Hide All</source>
+        <translation>Dölj alla</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="255"/>
+        <source>Readonly All</source>
         <translation>Skrivskydda alla</translation>
     </message>
     <message>
@@ -1812,81 +1823,81 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
         <source>Tracks</source>
         <translation>Spår</translation>
     </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulär</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation>Synligt</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation>Skrivskyddad</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>Låg</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>Hög</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>Ogenomskinlig</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Ogenomskinlighet</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulär</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1894,17 +1905,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1918,2595 +1929,2647 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Rensa tagg '%1' från %2</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Ta bort medlem '%1' från %2</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Hjälp</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Skapa ytinteration</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Skapa</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Skapa yta %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Väg</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Yta: Skapa väg %1</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>&Redigera</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Lägg till ett hål</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Visa</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Vill du lägga till (ytterligare) ett hål i den här ytan?</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Bokmärken</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Yta: Slutför väg %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Sätt &projektion</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Yta: Lägg till nod %1 till väg %2</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Sätt &ogenomskinlighet för ytor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Fil</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Exportera</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Lägg till noder till dubbelriktad väg %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Öppna &nyligen använd</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Skapa dubbelväg Väg %1</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Importera nyligen använd</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Skapa nod-interaktion</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>Ver&ktyg</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Skapa nod för väg: %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Stil</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>VÄNSTERKLICKA för att starta;DRAG till skala;SHIFT-DRAG för att rotera;VÄNSTER-KLICKA för att avsluta</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Nod</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Skapa polygoninteraktion</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>&Fönster</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Skapa polygon %1</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Paneler</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Skapa rondell-interaktion</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>Tecken</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Skapa rondell %1</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation>OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Skapa väg-interaktion</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Lager</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Skapa nod %1 för väg %2</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Skapa väg: %1</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Rel&ation</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Skapa nod: %1</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation>&Visa</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Lägg till Nod %1 till Väg %2</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Visa riktnings&pilar</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation>Huvudverktygsrad</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>&Avsluta</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>&Om</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Redigera-interaktion</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Öppna</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Skapa ett nytt dokument och importera en fil</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Zooma &alla</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Flytta noder</translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Flytta nod %1</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Zooma &fönster</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Noder vid samma position funna</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Zoomfönster</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Vill du slå ihop alla noder vid punkten där du släppte?</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Slå ihop noder till %1</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>Zooma &ut</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Ta bort tecken %1</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>VÄNSTERKLICKA för att välja; VÄNSTERDRAG för att flytta</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>Zooma &in</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Flytta nodinteraktion</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Zooma in</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Rotera interaktion</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Böjd länk</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Ångra</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>VÄNSTERKLICKA till första hörnet -> VÄNSTER-DRAG till en yta -> VÄNSTERKLICKA för att zooma</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Zoominteraktion</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Gör om</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>ruta %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Egenskaper...</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Flytta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Kan inte ladda projektionsfil</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>"Projectons.xml" kunde inte öppnas någonstans. Avbryter.</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Importera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>Låg</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Importera en fil till aktuellt dokument</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>Hög</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Ladda ner</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>Ogenomskinlig</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Ladda ner kartdata för ett nytt område</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation>Redigera</translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Länka</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation>Vy</translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Skapa länk</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation>Visa</translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation>Riktningspilar</translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Markera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Lager</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>Ladda &upp</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation>Skapa</translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Ladda upp ändringar till servern</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Tecken</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Nod</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>&Ta bort</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Väg</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Ta bort valda tecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Relation</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Verktyg</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Skapa ny väg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation>Fönster</translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation>Hjälp</translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Skapa ny nod</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Urklipp ogiltig</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Ändra riktning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Urklipp innehåller inte giltiga data</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Vänd riktning på väg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Osparade ändringar</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Gå till...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>Den aktuella kartan innehåller osparade ändringar som kommer förloras när en ny skapas.
-Vill du avbryta skapandet av en ny karta eller fortsätta och förkasta ändringarna?</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>&Dubbla körbanor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Skapa dubbla körbanor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Vägpunkter</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Spår %1</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Skapa rondell</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Stor Fet Varning Angående Upphovsrätt</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Ny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Du försöker importera en KML-fil. Observera att:
- - Du kan inte importera en KML-fil skapad från Google Earth till OSM. Även om du 
-   kanske tror att noder skapade från GE är dina så är de inte det!
-   De är fortfarande ett härlett arbete från GE och kan därför inte användas i OSM.
-
- - Om du laddade ner det från internet, kan det vara upphovsrättskyddat.
-   Var absolut säker på att skaparen av datan tillåter att de används i OSM eller att de är
-   i Public Domain (det finns ingen upphovsrätt på de)
-
-Om du är osäker, vänligen fråga på OpenStreetMaps mailinglistor "legal" eller "talk".
-
-Är du helt säker på att upphovsrätten för denna KML-fil tillåter att den importeras till OSM?</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Skapar ett nytt tomt dokument</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Dela</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>splittra väg till separata (förbundna) vägar</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Sammanfoga</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Förena sammanhängande vägar till en väg.</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Ingen giltig fil</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>%Slå isär</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 kunde inte öppnas</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Slå isär</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Slå isär sammanhängande vägar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>Re&lation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Gammal version av Qt upptäckt</translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Skapa relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Din installation använder Qt %1, vilket innehåller en del kända fel med uppladdning till OpenStreetMap,vilket leder till 401-felmeddelanden från servern. Är du säker på att du vill fortsätta (ej rekommenderat).
-För mer information se http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor (på engelska)</translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>&Yta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Ladda upp OSM</translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Skapa ny yta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Det verkar som att du inte har angett
-ditt användarnamn och lösenord för OSM.
-Vill du göra detta nu?</translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>&Redigera...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Fel vid nedladdning</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Spara s&om...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Kartan kunde inte laddas ner</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Ladda...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation>Problem med att ladda ner OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Böjd väg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation>OpenStreetBugs kunde inte laddas ner</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Inställningar...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Alla...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Exportera alla synliga lager till en fil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Skapa polygon</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>&Sök...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Ange antal sidor</translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Sök</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Förena vägar</translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Sök och välj föremål</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>splittra vägar</translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Vy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Slå isär vägar</translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Exportera tecknes i vyn till en fil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation>Förenkla vägar</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Lägg till...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Tvinga uppladdning av tecken</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Ta bort...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation>Tidsgräns för nätverk</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>&Slå ihop</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation>Kan inte nå OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Slå ihop noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation>Problem med att slutföra bugg</translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>Slå ihop valda noder (första valda blir kvar)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation>Kan inte ta bort bugg. Meddelande från servern:
-%1</translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Skapa knutpunkt</translation>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Spara</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Flera skärningspunkter</translation>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Spara till fil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Dessa vägar har flera skärningar.
-Vill du fortfarande skapa en korsning för varje (Oönskade skärningar kan fortfarande tas bort efteråt)?</translation>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Lägg till gatnummer</translation>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Ladda ner mer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation>Antal segment att dela upp i</translation>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Ladda ner mer kartdata för nuvarande vy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Ladda ner nuvarande vyn till tidigare nedladdat lager</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation>dela upp väg i %1</translation>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Egenskaper</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Dölj/Visa ruta för Egenskaper</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Dölj/Visa ruta för lager</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Information</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Visa/Dölj Inforuta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>&Justera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Rikta in noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Rikta in valda noder. Första två valda ger linjen.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation>&Sprid</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation>Sprid noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Rikta in noder</translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation>Räta och sprid valda noder lika</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation>Sprid noder</translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Dölj/Visa ruta för ångra</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Lösgör nod %1</translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Lägg till medlem till relation</translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Visa &nerladdade ytor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Ta bort medlemmar från relationer</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Kopiera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Kopiera valt tecken och taggar till urklipp</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation>Dela yta</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Kopiera valda teckens taggar till urklipp; om tecknet är en spårpunkt, kopiera också koordinaterna.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation>Gör yta till husrad med %1</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Skapa relation %1</translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Klistra in taggar (&Skriv över)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Spara stil för karta</translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Klistra in (och skriv över) taggar från utklipp till det valda tecknet</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Merkaartor kartstil (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Ladda kartstil</translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Klistra in taggar (&Slå ihop)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Format som stödjs</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Klistra in taggar</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Klistra in taggar från urklipp (Lägg till existerande taggar)</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Slå ihop taggar i urklipp med de för den valda tecknet.</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Valda...</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Klistra in tecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>GPS utbytesformat (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Klistra in</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>OpenStreetMap filformat (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Klistra in tecken från urklipp</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation>OpenStreetMap ändringsformat (*.osc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Klistra in tecken till urklipp; Om tecknens id redan finns i dokumentet, skriv över dem.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Noni GPSPlot-format (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>NMEA GPS logg-format (*.nmea, *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>KML-fil (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (binärt)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation>Kommaseparerat format (*.csv)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>Tvinga uppladdning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Geotaggad bild (*jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Överlämna tecken till skräplagret</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>ESRI Shapefil (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Överlämna det valda tecknet från ett icke-uppladdningsbart lager (t.ex. Spår eller Extract) till skräplagret, redo för uppladdning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Merkaartor-dokument (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Visa eller dölj verktygsraden</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Väg</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Dölj/Visa verktygsrad</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Ladda bild</translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Dölj alla</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation>Lägg till nodposition till bild</translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation>Geotagga bild från denna position</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Visa alla</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>&Bildlager</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation>&Rasterbild/SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation>Visa &noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation>Visa na&mn</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Spara Merkaartor-dokument</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>namnlös</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Starta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Merkaartor dokumentfiler (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Starta GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Alla filer (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>&Spela om</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Återspela GPS-spår</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Kan inte öppna sparad fil</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Dölj/Visa GPS-ruta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 kunde inte öppnas för skrivning</translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>S&toppa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Ogiltig fil</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Stoppa GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 är inte en giltig Merkaartor-fil</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Centrera på GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Exportera OSM-format</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Visa spår&segment</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>OSM filer (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation>Exportera osmChange</translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Visa &skala</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation>osmChange filer (*.osc)</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Exportera GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Visa &relationer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>GPX-filer (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Exportera KML</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Visa vägbakgrunder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>KML-filer (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Visa vägkanter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Visa försköning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Spela in</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Spela in GPS-spår</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Pausa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Lägg till bokmärke</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Pausa GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Ange ett namn för bokmärket</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eorefererad bild</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Ogiltigt namn på bokmärke</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Dölj/Visa ruta för geotaggning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Bokmärke kan inte vara tom</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Varning: Bokmärkesnamn finns redan</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>World OSB hanterare</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Skriv in en ny; behåll samma för att skriva över eller avbryta.</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Genvägsredigerare...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Ta bort bokmärke</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>&Slå ihop...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Välj bokmärke att ta bort</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Spara...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Ogiltig kartprojektion</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Lägg till medlem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Kan inte sätta projektion "%1".</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Ta bort medlem</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>GPS-fel</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>A&ldrig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Kan inte öppna port för GPS.</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>för &enkelriktade vägar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Öppna NMEA loggfil</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&Alltid</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Spara mall för taggar</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Koppla loss</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Merkaartor taggmallar (*.mat)</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Lösgör nod från en väg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Öppna taggmall</translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Lösgör en nod från en väg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Arbeta nedkopplad</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>SVG</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Hjälp</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Stilar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Skapa</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Dölj/Visa ruta för stilar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Väg</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>&Redigera</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation>&Redigera WMS servrar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Visa</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation>Redigera &TMS servrar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Bokmärken</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Sätt &projektion</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>GPS-meny</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Visa riktnings&pilar</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Kamera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Sätt &ogenomskinlighet för ytor</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Skapa &knutpunkt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Fil</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Rotera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Exportera</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Öppna &nyligen använd</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Importera nyligen använd</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>Ver&ktyg</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Stil</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Tecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Nod</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>Lägg till &gatunummer (Karlsruheschema)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>&Fönster</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation>&Dela upp</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Paneler</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation>Dela upp segment lika</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>Tecken</translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation>Dela upp vald vägavsnitt (vägen och två närliggande noder) i segment med lika längd</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation>OpenStreetBugs</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Visa &virtuella noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Lager</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation>Visa lat/lon &grid</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation>&Lås zoomning till rutad bakgrund</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Rel&ation</translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation>Redigering av &Projektioner</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation>&Visa</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation>Visa &foton på kartan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>&Avsluta</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation>OsmChange (OSC)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>&Om</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation>Tvinga radering</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Öppna</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Skapa ett nytt dokument och importera en fil</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation>För&enkla</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Zooma &alla</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation>Förenkla väg(ar)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation>Förenkla väg genom att ta bort onödiga delnoder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Zooma &fönster</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation>&Filter-redigerare</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Zoomfönster</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation>I&nga</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>Zooma &ut</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>Zooma &in</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation>&Dela yta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Zooma in</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation>Dela yta mellan två noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Böjd länk</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation>&Terrass</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Ångra</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation>Dela vald yta i "terrasserade" tomter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Gör om</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation>Redigera verktygsfält...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Flytta</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Importera</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Importera en fil till aktuellt dokument</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Ladda ner</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Egenskaper...</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Ladda ner kartdata för ett nytt område</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Länka</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Skapa länk</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Markera</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>Ladda &upp</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Ladda upp ändringar till servern</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>&Ta bort</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Ta bort valda tecken</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Skapa ny väg</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Skapa ny nod</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Ändra riktning</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Vänd riktning på väg</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Gå till...</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>&Dubbla körbanor</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Ladda ner saknade barn</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Skapa dubbla körbanor</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Skapa rondell</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Ny</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Rensa tagg '%1' från %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Skapar ett nytt tomt dokument</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation>Rensa %1 taggar på %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Dela</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>splittra väg till separata (förbundna) vägar</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Ta bort medlem '%1' från %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation>Ändra ordning på medlemmar till relation %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Sammanfoga</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Relation modifierad %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Förena sammanhängande vägar till en väg.</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Skapa nod-interaktion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Skapa nod för väg: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>%Slå isär</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Skapa ytinteration</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Slå isär</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Skapa yta %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Slå isär sammanhängande vägar</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Yta: Skapa väg %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Lägg till ett hål</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>Re&lation</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Vill du lägga till (ytterligare) ett hål i den här ytan?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Skapa relation</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Yta: Slutför väg %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>&Yta</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Yta: Lägg till nod %1 till väg %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Skapa ny yta</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>&Redigera...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Spara...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Lägg till noder till dubbelriktad väg %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Ladda...</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Skapa dubbelväg Väg %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Böjd väg</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>VÄNSTERKLICKA för att starta;DRAG till skala;SHIFT-DRAG för att rotera;VÄNSTER-KLICKA för att avsluta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Inställningar...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Skapa polygoninteraktion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Alla...</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Skapa polygon %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Exportera alla synliga lager till en fil</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Skapa rondell-interaktion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>&Sök...</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Skapa rondell %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Sök</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Skapa väg-interaktion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Sök och välj föremål</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Skapa nod %1 för väg %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Vy</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Skapa väg: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Exportera tecknes i vyn till en fil</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Skapa nod: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Lägg till...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Lägg till Nod %1 till Väg %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Ta bort...</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>&Slå ihop</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Slå ihop noder</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>Slå ihop valda noder (första valda blir kvar)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Redigera-interaktion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Ta bort tecken %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Spara s&om...</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Spara</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Ta bart barn</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Spara till fil</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Ladda ner mer</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Ladda ner mer kartdata för nuvarande vy</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>VÄNSTERKLICKA för att välja; VÄNSTERDRAG för att flytta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Ladda ner nuvarande vyn till tidigare nedladdat lager</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Flytta nodinteraktion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Flytta noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Egenskaper</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Flytta nod %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Dölj/Visa ruta för Egenskaper</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Noder vid samma position funna</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Vill du slå ihop alla noder vid punkten där du släppte?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Dölj/Visa ruta för lager</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Slå ihop noder till %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Information</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Rotera interaktion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Visa/Dölj Inforuta</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>&Justera</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Rikta in noder</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Rikta in valda noder. Första två valda ger linjen.</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>VÄNSTERKLICKA till första hörnet -> VÄNSTER-DRAG till en yta -> VÄNSTERKLICKA för att zooma</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Zoominteraktion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation>&Sprid</translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>GPS utbytesformat (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation>Sprid noder</translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>OpenStreetMap filformat (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation>Räta och sprid valda noder lika</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation>OpenStreetMap ändringsformat (*.osc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Dölj/Visa ruta för ångra</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Noni GPSPlot-format (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>NMEA GPS logg-format (*.nmea, *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Visa &nerladdade ytor</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>KML-fil (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation>Kommaseparerat format (*.csv)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Kopiera</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Geotaggad bild (*jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Kopiera valt tecken och taggar till urklipp</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>ESRI Shapefil (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Kopiera valda teckens taggar till urklipp; om tecknet är en spårpunkt, kopiera också koordinaterna.</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Klistra in taggar (&Skriv över)</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Format som stödjs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Klistra in (och skriv över) taggar från utklipp till det valda tecknet</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Merkaartor-dokument (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Alla filer (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Klistra in taggar (&Slå ihop)</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>ruta %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Klistra in taggar</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Kan inte ladda projektionsfil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Klistra in taggar från urklipp (Lägg till existerande taggar)</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>"Projectons.xml" kunde inte öppnas någonstans. Avbryter.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Slå ihop taggar i urklipp med de för den valda tecknet.</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>Låg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>Hög</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Valda...</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>Ogenomskinlig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Tecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Nod</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Väg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Ladda bild</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation>Lägg till nodposition till bild</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation>Geotagga bild från denna position</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation>Redigera</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation>Vy</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation>Riktningspilar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Lager</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation>Skapa</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Väg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Verktyg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation>Fönster</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation>Hjälp</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Urklipp ogiltig</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Ladda ner saknade barn</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Urklipp innehåller inte giltiga data</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Osparade ändringar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>Den aktuella kartan innehåller osparade ändringar som kommer förloras när en ny skapas.
+Vill du avbryta skapandet av en ny karta eller fortsätta och förkasta ändringarna?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Vägpunkter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Spår %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Stor Fet Varning Angående Upphovsrätt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Du försöker importera en KML-fil. Observera att:
+ - Du kan inte importera en KML-fil skapad från Google Earth till OSM. Även om du 
+   kanske tror att noder skapade från GE är dina så är de inte det!
+   De är fortfarande ett härlett arbete från GE och kan därför inte användas i OSM.
+
+ - Om du laddade ner det från internet, kan det vara upphovsrättskyddat.
+   Var absolut säker på att skaparen av datan tillåter att de används i OSM eller att de är
+   i Public Domain (det finns ingen upphovsrätt på de)
+
+Om du är osäker, vänligen fråga på OpenStreetMaps mailinglistor "legal" eller "talk".
+
+Är du helt säker på att upphovsrätten för denna KML-fil tillåter att den importeras till OSM?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Klistra in</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Ingen giltig fil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Klistra in tecken från urklipp</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 kunde inte öppnas</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Klistra in tecken till urklipp; Om tecknens id redan finns i dokumentet, skriv över dem.</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (binärt)</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>Tvinga uppladdning</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Gammal version av Qt upptäckt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Överlämna tecken till skräplagret</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Din installation använder Qt %1, vilket innehåller en del kända fel med uppladdning till OpenStreetMap,vilket leder till 401-felmeddelanden från servern. Är du säker på att du vill fortsätta (ej rekommenderat).
+För mer information se http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor (på engelska)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Överlämna det valda tecknet från ett icke-uppladdningsbart lager (t.ex. Spår eller Extract) till skräplagret, redo för uppladdning</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Ladda upp OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Det verkar som att du inte har angett
+ditt användarnamn och lösenord för OSM.
+Vill du göra detta nu?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Fel vid nedladdning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Visa eller dölj verktygsraden</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Kartan kunde inte laddas ner</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Dölj/Visa verktygsrad</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation>Problem med att ladda ner OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Dölj alla</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation>OpenStreetBugs kunde inte laddas ner</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Visa alla</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>&Bildlager</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Skapa polygon</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation>Visa &noder</translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Ange antal sidor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation>Visa na&mn</translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Förena vägar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation>&Redigera WMS servrar</translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>splittra vägar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation>Redigera &TMS servrar</translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Slå isär vägar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation>&Dela upp</translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation>Förenkla vägar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation>Dela upp segment lika</translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Tvinga uppladdning av tecken</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation>Dela upp vald vägavsnitt (vägen och två närliggande noder) i segment med lika längd</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation>Tidsgräns för nätverk</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation>För&enkla</translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation>Kan inte nå OpenStreetBugs</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation>Förenkla väg(ar)</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation>Problem med att slutföra bugg</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation>Förenkla väg genom att ta bort onödiga delnoder</translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation>Kan inte ta bort bugg. Meddelande från servern:
+%1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation>&Filter-redigerare</translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Skapa knutpunkt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation>I&nga</translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Flera skärningspunkter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Dessa vägar har flera skärningar.
+Vill du fortfarande skapa en korsning för varje (Oönskade skärningar kan fortfarande tas bort efteråt)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Lägg till gatnummer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation>Antal segment att dela upp i</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation>&Dela yta</translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation>Dela yta mellan två noder</translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation>dela upp väg i %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation>&Terrass</translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation>Dela vald yta i "terrasserade" tomter</translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation>Redigera verktygsfält...</translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation>&Rasterbild/SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation>Huvudverktygsrad</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Starta</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Starta GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>&Spela om</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Återspela GPS-spår</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Dölj/Visa GPS-ruta</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Rikta in noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation>Sprid noder</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>S&toppa</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Lösgör nod %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Stoppa GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Lägg till medlem till relation</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Centrera på GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Ta bort medlemmar från relationer</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Visa spår&segment</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Visa &skala</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation>Dela yta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation>Gör yta till husrad med %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Visa &relationer</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Skapa relation %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Spara stil för karta</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Visa vägbakgrunder</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Merkaartor kartstil (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Visa vägkanter</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Ladda kartstil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Visa försköning</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Spela in</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Spela in GPS-spår</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Pausa</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Pausa GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>namnlös</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eorefererad bild</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Spara Merkaartor-dokument</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Dölj/Visa ruta för geotaggning</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Merkaartor dokumentfiler (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>World OSB hanterare</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Kan inte öppna sparad fil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Genvägsredigerare...</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 kunde inte öppnas för skrivning</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>&Slå ihop...</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Lägg till medlem</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Ogiltig fil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Ta bort medlem</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 är inte en giltig Merkaartor-fil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>A&ldrig</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Exportera OSM-format</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>för &enkelriktade vägar</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>OSM filer (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&Alltid</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation>Exportera osmChange</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Koppla loss</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation>osmChange filer (*.osc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Lösgör nod från en väg</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Exportera GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Lösgör en nod från en väg</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>GPX-filer (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Arbeta nedkopplad</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Exportera KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>SVG</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>KML-filer (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Stilar</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Dölj/Visa ruta för stilar</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>GPS-meny</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Lägg till bokmärke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Ange ett namn för bokmärket</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Skapa &knutpunkt</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Ogiltigt namn på bokmärke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Rotera</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Bokmärke kan inte vara tom</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Varning: Bokmärkesnamn finns redan</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Klistra in tecken</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Skriv in en ny; behåll samma för att skriva över eller avbryta.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Tecken</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Ta bort bokmärke</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>Lägg till &gatunummer (Karlsruheschema)</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Välj bokmärke att ta bort</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation>Visa lat/lon &grid</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Ogiltig kartprojektion</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation>&Lås zoomning till rutad bakgrund</translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Kan inte sätta projektion "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation>Redigering av &Projektioner</translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>GPS-fel</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation>Visa &foton på kartan</translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Kan inte öppna port för GPS.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation>OsmChange (OSC)</translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Öppna NMEA loggfil</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation>Tvinga radering</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Spara mall för taggar</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Stäng</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Merkaartor taggmallar (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Relation modifierad %1</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Öppna taggmall</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Ta bart barn</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Unresolved conflicts</source>
         <translation>Olösta konflikter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Please resolve existing conflicts first</source>
         <translation>Lös först alla konflikter</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
         <source>It is strongly recommended to save the changes to your document after an upload.
 Do you want to do this now?</source>
         <translation>Det är starkt rekommenderat att spara dina ändringar i dokumentet efter en uppladdning.
@@ -4524,222 +4587,181 @@ Vill du göra detta nu?</translation>
         <source>Set Tags on %1</source>
         <translation>Sätt taggar för %1</translation>
     </message>
+</context>
+<context>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Visa &virtuella noder</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation>Rensa %1 taggar på %2</translation>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
+        <source><i>V: </i><b>%1</b> </source>
+        <translation><i>V: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation>Ändra ordning på medlemmar till relation %1</translation>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
+        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
+        <translation><i>sista: </i><b>%1</b> av <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>sista: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
+        <source><br/><i>layer: </i><b>%1</b> </source>
+        <translation><br/><i>lager: </i><b>%1</b&gt; </translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Vägpunkt</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>koord</translation>
     </message>
-</context>
-<context>
-    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
-        <source><i>V: </i><b>%1</b> </source>
-        <translation><i>V: </i><b>%1</b&gt; </translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>beskrivning</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
-        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>sista: </i><b>%1</b> av <b>%2</b></translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>kommentar</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>sista: </i><b>%1</b></translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Nod</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
-        <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation><br/><i>lager: </i><b>%1</b&gt; </translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>höjd</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>hastighet</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>storlek</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
         <translation>medlemmar</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>Övre vänster</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>Nedhöger</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Relation</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Roll</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Medlem</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Längd</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Storlek</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>%1 noder</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
-        <source>Way</source>
-        <translation>Väg</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>Yta</translation>
     </message>
     <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>koord</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>höjd</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>hastighet</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>beskrivning</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>kommentar</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Vägpunkt</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Nod</translation>
+        <location filename="../src/Features/Way.cpp" line="915"/>
+        <source>Way</source>
+        <translation>Väg</translation>
     </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 km</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="351"/>
+        <source>%1ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="351"/>
-        <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
         <translation>Vy</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Projektion</translation>
     </message>
@@ -4753,22 +4775,32 @@ Vill du göra detta nu?</translation>
         <translation>Nytt bokmärke</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Uppladdning av inställningar misslyckades</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Duplicera nyckel</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Mer än 150 preferenser</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
         <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
         <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
@@ -4803,17 +4835,17 @@ Vill du göra detta nu?</translation>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Okänt fält</translation>
     </message>
@@ -4826,25 +4858,10 @@ Vill du göra detta nu?</translation>
         <translation>Fel!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Värd för namnsöksservice hittades inte</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Värd för namnsöksservice nekar anslutning</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Namnsöksservice kräver autentisering</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Okänt fel.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4865,11 +4882,6 @@ Vill du göra detta nu?</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4877,6 +4889,11 @@ Vill du göra detta nu?</translation>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4903,7 +4920,7 @@ Vill du göra detta nu?</translation>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
@@ -4918,12 +4935,12 @@ Vill du göra detta nu?</translation>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
@@ -4933,27 +4950,27 @@ Vill du göra detta nu?</translation>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4982,31 +4999,12 @@ Vill du göra detta nu?</translation>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Alltid</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Välj färg</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Redigerare för kartstil</translation>
@@ -5039,6 +5037,31 @@ Vill du göra detta nu?</translation>
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Propertionell tjocklek</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>fast tjocklek</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
         <translation>Filter</translation>
@@ -5087,31 +5110,6 @@ Vill du göra detta nu?</translation>
         <translation>Rita med färg</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Propertionell tjocklek</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>fast tjocklek</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5131,7 +5129,7 @@ Vill du göra detta nu?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5141,12 +5139,12 @@ Vill du göra detta nu?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5166,7 +5164,7 @@ Vill du göra detta nu?</translation>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5203,6 +5201,25 @@ Vill du göra detta nu?</translation>
         <source>Label with background tag</source>
         <translation>Etikett med bakgrundstagg</translation>
     </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Alltid</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
+        <source>Select Color</source>
+        <translation>Välj färg</translation>
+    </message>
 </context>
 <context>
     <name>PhotoLoadErrorDialog</name>
@@ -5220,12 +5237,12 @@ Vill du göra detta nu?</translation>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
         <source>This photo does not contain geo-tagging EXIF data.
 What do you want to do next?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
         <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
@@ -5251,207 +5268,47 @@ What do you want to do next?</source>
 <context>
     <name>PictureViewerDialog</name>
     <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Output filename</source>
-        <translation>Utdatafilnamn</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>SVG-filer (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>untitled</source>
-        <translation>namnlös</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Alla filer (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation>Bildfil (*.png, *.jpg)</translation>
-    </message>
-    <message>
         <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
         <source>Dialog</source>
         <translation>Dialogruta</translation>
     </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>Engelska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Arabiska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Tjeckiska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>Tyska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>Franska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation>Ungerska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Italienska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation>Polska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation>Brasiliansk portugisiska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Ryska</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Mapp för anpassade stilar</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Taggmall</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Merkaartor taggmall (*.mat)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
-        <source>Select Color</source>
-        <translation>Välj färg</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Verktyg finns redan</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Ett verktyg med det här namnet finns redan.
-Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra den nuvarande.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Kan inte ta bort snabbväljare</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Kan inte ta bort snabbväljare "%1"</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Kan inte modifiera snabbväljares namn</translation>
-    </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Kan inte modifiera snabbväljare "%1"s namn</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Output filename</source>
+        <translation>Utdatafilnamn</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Välj verktyg körbar fil</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>untitled</source>
+        <translation>namnlös</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>SVG-filer (*.svg)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>Alla filer (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Välj mapp för logg</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation>Bildfil (*.png, *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
         <source>Preferences</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Språkanpassning</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Du kanske måste starta om programmet för att ändringarna ska träda i kraft</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Använd språk</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Översätt standardtaggar</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
         <source>Visual</source>
         <translation>Visuell</translation>
@@ -5472,11 +5329,6 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Ogenomskinlighet låg/hög</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
         <translation>Enkel musknapp interakton</translation>
@@ -5487,6 +5339,26 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Använd skräddarsydd Qt-stil</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
+        <source>Use Virtual nodes (new session required)</source>
+        <translation>Använd virtuella noder (ny session krävs)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Relationer valbara när de är gömda</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
         <source>Colors</source>
         <translation>Färger</translation>
@@ -5518,9 +5390,9 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Skriv över stil</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Sväva</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>GPX-spår</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5533,149 +5405,166 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Bildpunkter</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Framhäva</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Fokusera</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Relationer</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>GPX-spår</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
         <source>Use simple GPX track appearance</source>
         <translation>Använd förenklad GPX-spår visning</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Kartstil</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Aktuell stil</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Avaktivera stilar för spårlager</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Gränssnitt</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Mall</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Sväva</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Inbyggd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Relationer</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Anpassad</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Fokusera</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Data</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Framhäva</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Lösenord:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Språkanpassning</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Dokument</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Du kanske måste starta om programmet för att ändringarna ska träda i kraft</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Använd språk</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Översätt standardtaggar</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Kartstil</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Mapp för anpassade stilar</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Aktuell stil</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Avaktivera stilar för spårlager</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Mall</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Taggmall</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Inbyggd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Anpassad</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Data</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
@@ -5686,7 +5575,17 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Dokument</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
@@ -5716,12 +5615,12 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5729,6 +5628,32 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>GPS</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
+        <source>GPS input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
+        <source>gpsd</source>
+        <translation>gpsd</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
+        <source>Serial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
+        <source>Host</source>
+        <translation>Värdnamn:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1196"/>
         <source>Save NMEA log</source>
         <translation>Spara NMEA-logg</translation>
@@ -5754,6 +5679,11 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Använd proxy</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Lösenord:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
         <source>User:</source>
         <translation>Användare:</translation>
@@ -5771,7 +5701,7 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
@@ -5806,7 +5736,7 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
@@ -5839,40 +5769,59 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
-        <source>GPS input</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>Engelska</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Arabiska</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Tjeckiska</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
+        <source>Dutch</source>
+        <translation>Nederländska</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
-        <source>gpsd</source>
-        <translation>gpsd</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>Tyska</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>Franska</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1130"/>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1168"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation>Ungerska</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1158"/>
-        <source>Host</source>
-        <translation>Värdnamn:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Italienska</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
-        <source>Use Virtual nodes (new session required)</source>
-        <translation>Använd virtuella noder (ny session krävs)</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
-        <source>Dutch</source>
-        <translation>Nederländska</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation>Polska</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
@@ -5880,6 +5829,16 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Portugisiska</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation>Brasiliansk portugisiska</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Ryska</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
         <source>Slovak</source>
         <translation>Slovakiska</translation>
@@ -5900,14 +5859,66 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Ukrainska</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Relationer valbara när de är gömda</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Merkaartor taggmall (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Gränssnitt</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Välj färg</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Verktyg finns redan</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Ett verktyg med det här namnet finns redan.
+Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra den nuvarande.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Kan inte ta bort snabbväljare</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Kan inte ta bort snabbväljare "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Kan inte modifiera snabbväljares namn</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Kan inte modifiera snabbväljare "%1"s namn</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Välj verktyg körbar fil</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Välj mapp för logg</translation>
     </message>
 </context>
 <context>
@@ -5960,7 +5971,7 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5968,7 +5979,7 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5981,40 +5992,40 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6048,6 +6059,11 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Egenskaper - Flera element</translation>
     </message>
     <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Egenskaper - Nod</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
         <translation>Egenskaper - Väg</translation>
@@ -6066,7 +6082,7 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
@@ -6083,38 +6099,10 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <source>Select member</source>
         <translation>Välj medlem</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Egenskaper - Nod</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Kaskadrensning</translation>
@@ -6140,7 +6128,30 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Flytta nod %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
         <translation>Importera osmChange</translation>
     </message>
@@ -6150,31 +6161,31 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <translation>Importera NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Importera NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6190,14 +6201,14 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6227,7 +6238,7 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6238,12 +6249,12 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Fel på GPS-logg</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Kan inte skapa GPS-loggfil: %1</translation>
     </message>
@@ -6251,17 +6262,17 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
         <translation>Kan inte koppla upp till %1: %2</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Fel på GPS-logg</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Kan inte skapa GPS-loggfil: %1</translation>
     </message>
@@ -6347,92 +6358,136 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
         <translation>Verktygsfält</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
         <translation>Byt namn</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
         <translation>Återställ alla</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Verkställ</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
         <translation>Upp</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
         <translation><-</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
         <translation>-></translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
         <translation>Ner</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6450,7 +6505,7 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
@@ -6468,17 +6523,17 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6506,17 +6561,17 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6572,7 +6627,7 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6586,12 +6641,12 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
@@ -6682,9 +6737,9 @@ Välj ett annat namn eller klicka på <Apply> knappen om du vill ändra de
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
@@ -6692,44 +6747,44 @@ p, li { white-space: pre-wrap; }
         <translation>Projektion:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation>Mercator (EPSG:900913)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation>Lat/Lon (EPSG:4326)</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation>Referenspunkt är nedre vänster</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation>Mercator (EPSG:900913)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation>Lat/Lon (EPSG:4326)</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation>Referenspunkt är nedre vänster</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
@@ -6747,24 +6802,18 @@ p, li { white-space: pre-wrap; }
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Adress och sökväg kan inte lämnas tomma</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Nerladdning misslyckades: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
         <translation>Problem med att läsa tjänster.
@@ -6898,61 +6947,61 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Extrahera - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation># av spårsegment</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Totalt avstånd:</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Total varaktighet</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1:%2</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Extrahera - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Extrahera ritlager</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Zooma</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
@@ -6992,17 +7041,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7051,12 +7100,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Zooma</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Töm</translation>
     </message>
@@ -7064,35 +7113,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: GetCapabilites</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Adress och sökväg kan inte lämnas tomma</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Nerladdning misslyckades: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Fel vid läsning av möjligheter.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>Ställ in WMS-servrar</translation>
@@ -7132,9 +7152,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
@@ -7144,7 +7164,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
@@ -7154,7 +7174,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
         <source>Image format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
@@ -7164,12 +7184,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7186,5 +7206,34 @@ p, li { white-space: pre-wrap; }
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: GetCapabilites</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Adress och sökväg kan inte lämnas tomma</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Fel vid läsning av möjligheter.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Nerladdning misslyckades: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/merkaartor_uk.ts b/translations/merkaartor_uk.ts
index 26021b4..b293c1f 100644
--- a/translations/merkaartor_uk.ts
+++ b/translations/merkaartor_uk.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="uk">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,8 +13,8 @@
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-style:italic;">Merkaartor version</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1%2(%3)</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:small; font-weight:600;">%1</span></p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/AboutDialog.ui" line="42"/>
@@ -26,57 +24,57 @@ p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-style:italic;">Qt version</span> </p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:small;"><span style=" font-weight:600;">%1</span> (built with <span style=" font-weight:600;">%2</span>)</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="65"/>
+        <location filename="../src/common/AboutDialog.ui" line="54"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">PROJ4 version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="76"/>
+        <location filename="../src/common/AboutDialog.ui" line="65"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-size:small; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">GDAL version</span><br /><span style=" font-weight:600;">%1</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="114"/>
+        <location filename="../src/common/AboutDialog.ui" line="103"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
-    <message>
-        <location filename="../src/common/AboutDialog.ui" line="123"/>
-        <source>Copyright Bart Vanhauwaert, Chris Browet and others, 2006-2012</source>
-        <translation type="unfinished"></translation>
+    <message utf8="true">
+        <location filename="../src/common/AboutDialog.ui" line="112"/>
+        <source>Copyright Bart Vanhauwaert, Chris Browet, Ladislav Láska and others, 2006-2015</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="130"/>
-        <source>This program is licensed under the GNU Public License v2</source>
-        <translation>Ця програма ліцензована на умовах GNU Public License v2</translation>
+        <location filename="../src/common/AboutDialog.ui" line="119"/>
+        <source>This program is licensed under the GNU General Public License v2</source>
+        <translation>Ця програма ліцензована на умовах GNU General Public License v2</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="137"/>
+        <location filename="../src/common/AboutDialog.ui" line="126"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://merkaartor.be"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://merkaartor.be</span></a></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="157"/>
+        <location filename="../src/common/AboutDialog.ui" line="146"/>
         <source>Changelog</source>
         <translation>Перелік змін</translation>
     </message>
     <message>
-        <location filename="../src/common/AboutDialog.ui" line="200"/>
+        <location filename="../src/common/AboutDialog.ui" line="189"/>
         <source>OK</source>
         <translation>Так</translation>
     </message>
@@ -84,93 +82,123 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ActionsDialog</name>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Description</source>
         <translation>Опис</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="20"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="21"/>
         <source>Shortcut</source>
         <translation>Комбінації клавіш</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="41"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="46"/>
         <source>&Import</source>
         <translation>&Імпортувати</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="42"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="47"/>
         <source>&Export</source>
         <translation>&Експорт</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="43"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="48"/>
         <source>&Default</source>
         <translation>За&звичай</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="44"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="49"/>
         <source>&OK</source>
         <translation>&Так</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="45"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="50"/>
         <source>&Cancel</source>
         <translation>&Відміна</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="72"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="77"/>
         <source>Shortcut Editor</source>
         <translation>Редактор комбінацій клавіш</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
         <source>Load Shortcut scheme</source>
         <translation>Завантажити схеми комбінацій клавіш</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="116"/>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="121"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Merkaartor shortcut scheme (*.mss)</source>
         <translation>Схеми комбінацій клавіш Merkaartor (*.mss)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>Unable to open file</source>
         <translation>Неможливо відкрити файл</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="120"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="125"/>
         <source>%1 could not be opened.</source>
         <translation>%1 неможливо відкрити.</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>Save Shortcut scheme</source>
         <translation>Зберегти схему комбінації клавіш</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>untitled</source>
         <translation>без назви</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="143"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="148"/>
         <source>All Files (*)</source>
         <translation>Всі файли (*)</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>Unable to open save file</source>
         <translation>Неможливо відкрити збережений файл</translation>
     </message>
     <message>
-        <location filename="../src/Tools/ActionsDialog.cpp" line="159"/>
+        <location filename="../src/Tools/ActionsDialog.cpp" line="164"/>
         <source>%1 could not be opened for writing.</source>
         <translation>%1 неможливо відкрити для запису.</translation>
     </message>
 </context>
 <context>
+    <name>BuildBridgeInteraction</name>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>BridgeBuilder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="106"/>
+        <source>Sorry, I don't know how to build bridge from THAT. Please, give me two nodes only.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="111"/>
+        <source>Convert segment to bridge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="131"/>
+        <source>Selected segment is already tagged as bridge/tunnel. Please, make sure you know what you're doing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="138"/>
+        <source>Unsupported action: The bridge does not seem to be a single way.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command</name>
     <message>
         <location filename="../src/Commands/Command.cpp" line="25"/>
@@ -214,21 +242,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="67"/>
         <source>There is <b>no</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="70"/>
         <source>There is <b>one</b> dirty object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <location filename="../src/Docks/DirtyDock.cpp" line="74"/>
         <source>There are <b>%n</b> dirty objects</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.cpp" line="194"/>
@@ -258,9 +282,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There is <span style=" font-weight:600;">no</span> dirty object</p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/DirtyDock.ui" line="60"/>
@@ -271,7 +295,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DirtyLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="641"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="642"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
@@ -408,12 +432,12 @@ API message is '%1'</source>
         <source>There was an error uploading this request (%1)
 "%2"
 Please redownload the problematic feature to handle the conflict.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="102"/>
         <source>Checking changes...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="184"/>
@@ -474,97 +498,97 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Document</name>
     <message>
-        <location filename="../src/common/Document.cpp" line="88"/>
-        <location filename="../src/common/Document.cpp" line="100"/>
-        <location filename="../src/common/Document.cpp" line="110"/>
+        <location filename="../src/common/Document.cpp" line="91"/>
+        <location filename="../src/common/Document.cpp" line="103"/>
+        <location filename="../src/common/Document.cpp" line="113"/>
         <source>untitled</source>
         <translation>без назви</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="152"/>
-        <location filename="../src/common/Document.cpp" line="480"/>
+        <location filename="../src/common/Document.cpp" line="173"/>
+        <location filename="../src/common/Document.cpp" line="501"/>
         <source>Dirty layer</source>
         <translation>Шар чернетки</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="155"/>
+        <location filename="../src/common/Document.cpp" line="176"/>
         <source>Uploaded layer</source>
         <translation>Надісланий шар</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="352"/>
+        <location filename="../src/common/Document.cpp" line="373"/>
         <source>Background imagery</source>
         <translation>Фонове зображення</translation>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="369"/>
+        <location filename="../src/common/Document.cpp" line="390"/>
         <source>Drawing layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="378"/>
+        <location filename="../src/common/Document.cpp" line="399"/>
         <source>Filter layer #%1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="572"/>
+        <location filename="../src/common/Document.cpp" line="593"/>
         <source>OSM Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="582"/>
+        <location filename="../src/common/Document.cpp" line="603"/>
         <source>Exporting OSM...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="878"/>
+        <location filename="../src/common/Document.cpp" line="899"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1215"/>
+        <location filename="../src/common/Document.cpp" line="1229"/>
         <source>History rebuild: Create node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1221"/>
+        <location filename="../src/common/Document.cpp" line="1235"/>
         <source>History rebuild: Update node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1227"/>
+        <location filename="../src/common/Document.cpp" line="1241"/>
         <source>History rebuild: Delete node %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1233"/>
+        <location filename="../src/common/Document.cpp" line="1247"/>
         <source>History rebuild: Create way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1239"/>
+        <location filename="../src/common/Document.cpp" line="1253"/>
         <source>History rebuild: Update way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1245"/>
+        <location filename="../src/common/Document.cpp" line="1259"/>
         <source>History rebuild: Delete way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1251"/>
+        <location filename="../src/common/Document.cpp" line="1265"/>
         <source>History rebuild: Create relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1257"/>
+        <location filename="../src/common/Document.cpp" line="1271"/>
         <source>History rebuild: Update relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/Document.cpp" line="1263"/>
+        <location filename="../src/common/Document.cpp" line="1277"/>
         <source>History rebuild: Delete relation %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -592,12 +616,12 @@ Please redownload the problematic feature to handle the conflict.</source>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="74"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="88"/>
         <source>Xapi selector</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/DownloadMapDialog.ui" line="100"/>
@@ -618,248 +642,235 @@ Please redownload the problematic feature to handle the conflict.</source>
 <context>
     <name>Downloader</name>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="492"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="504"/>
-        <source>Download failed</source>
-        <translation>Невдача завантаження</translation>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="64"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="637"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="760"/>
+        <source>%1 download</source>
+        <translation>%1 завантажено</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="200"/>
-        <source>error</source>
-        <translation>помилка</translation>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="340"/>
+        <source>Downloading unresolved...</source>
+        <translation>Завантаження нерозв’язуваних елементів…</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="347"/>
+        <source>Downloading unresolved %1 of %2</source>
+        <translation>Завантажується нерозв’язуваний елемент %1 з %2</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="356"/>
+        <source>Parsing unresolved %1 of %2</source>
+        <translation>Обробка: нерозв’язуваний елемент %1 з %2</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="375"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="513"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="586"/>
+        <source>Parsing...</source>
+        <translation>Обробка…</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="466"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="382"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="520"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="593"/>
+        <source>Parsing XML</source>
+        <translation>Обробка XML</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="474"/>
+        <source>Conflicts from %1</source>
+        <translation>Конфлікт з %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="544"/>
+        <source>Empty roads/relations detected</source>
+        <translation>Знайдено порожні дороги/відношення</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="545"/>
+        <source>Empty roads/relations are probably errors.
+Do you want to mark them for deletion?</source>
+        <translation>Порожні дороги/відношення, можливо помилка.
+Бажаєте позначити їх для вилучення?</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="553"/>
+        <source>Remove empty feature %1</source>
+        <translation>Вилучення порожнього елементу %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="565"/>
+        <source>Conflicts have been detected</source>
+        <translation>Виявлено конфлікти</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportOSM.cpp" line="566"/>
+        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
+The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
+Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
+        <translation>Це значить , що для частини елементів, які ви змінили з моменту останнього завантаження хтось запровадив зміни на сервері.
+Елементи продубльовані у шарі "Конфлікти" як "conflict_…".
+Для того, щоб отримати можливість надіслати ваші зміни до сервера, вам потрібно власноруч об’єднати обидві версії та вилучити одну з них з шару "Конфлікти".</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
+        <source>Uploading...</source>
+        <translation>Відправка…</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
+        <source>Preparing changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="204"/>
-        <source>didn't download enough</source>
-        <translation>недостатньо завантажено</translation>
+        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
+        <source>Waiting for server response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="124"/>
+        <source>error</source>
+        <translation>помилка</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="331"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="166"/>
         <source>Downloading from OSM (%n bytes)</source>
-        <translation type="unfinished">
-            <numerusform>Завантаження з OSM (%n байт)</numerusform>
-            <numerusform>Завантаження з OSM (%n байти)</numerusform>
-            <numerusform>Завантаження з OSM (%n байтів)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/Sync/DownloadOSM.cpp" line="333"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="168"/>
         <source>Downloading from OSM (%n kBytes)</source>
-        <translation type="unfinished">
-            <numerusform>Завантаження з OSM (%n Кбайт)</numerusform>
-            <numerusform>Завантаження з OSM (%n Кбайти)</numerusform>
-            <numerusform>Завантаження з OSM (%n Кбайтів)</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="449"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="288"/>
         <source>Downloading...</source>
         <translation>Завантаження…</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="459"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="298"/>
         <source>Downloading from OSM (connecting)</source>
         <translation>Завантаження з OSM (з’єднуємось з сервером)</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="489"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="501"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="325"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="337"/>
         <source>Unexpected http status code (%1)
 Server message is '%2'</source>
         <translation>Неочікуваний код статусу http (%1)
 Відповідь сервера '%2'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="491"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="327"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="339"/>
         <source>
 API message is '%1'</source>
         <translation>
 повідомлення API: '%1'</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="498"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="328"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="340"/>
+        <source>Download failed</source>
+        <translation>Невдача завантаження</translation>
+    </message>
+    <message>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="334"/>
         <source>Username/password invalid</source>
         <translation>Хибні логін/пароль</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Unresolved conflicts</source>
         <translation>Нерозв’язувані конфлікти</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="516"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="352"/>
         <source>Please resolve existing conflicts first</source>
         <translation>Будь ласка, розв’яжіть поточні конфлікти</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="667"/>
-        <source>MapDust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="728"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="690"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="752"/>
-        <source>Downloading points</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="454"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="539"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="677"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="739"/>
-        <source>Parsing...</source>
-        <translation>Обробка…</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="460"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="546"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="684"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="746"/>
-        <source>Parsing XML</source>
-        <translation>Обробка XML</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="554"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="390"/>
         <source>Downloading trackpoints %1-%2</source>
         <translation>Завантажуються точки треку %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="573"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="409"/>
         <source>Downloaded track - nodes %1-%2</source>
         <translation>Завантажений трек - точки %1-%2</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="63"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="613"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="779"/>
-        <location filename="../src/Sync/DownloadOSM.cpp" line="901"/>
-        <source>%1 download</source>
-        <translation>%1 завантажено</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="334"/>
-        <source>Downloading unresolved...</source>
-        <translation>Завантаження нерозв’язуваних елементів…</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="341"/>
-        <source>Downloading unresolved %1 of %2</source>
-        <translation>Завантажується нерозв’язуваний елемент %1 з %2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="350"/>
-        <source>Parsing unresolved %1 of %2</source>
-        <translation>Обробка: нерозв’язуваний елемент %1 з %2</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="468"/>
-        <source>Conflicts from %1</source>
-        <translation>Конфлікт з %1</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="559"/>
-        <source>Conflicts have been detected</source>
-        <translation>Виявлено конфлікти</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="560"/>
-        <source>This means that some of the feature you modified since your last download have since been modified by someone else on the server.
-The features have been duplicated as "conflict_..." on the "Conflicts..." layer.
-Before being able to upload your changes, you will have to manually merge the two versions and remove the one from the "Conflicts..." layer.</source>
-        <translation>Це значить , що для частини елементів, які ви змінили з моменту останнього завантаження хтось запровадив зміни на сервері.
-Елементи продубльовані у шарі "Конфлікти" як "conflict_…".
-Для того, щоб отримати можливість надіслати ваші зміни до сервера, вам потрібно власноруч об’єднати обидві версії та вилучити одну з них з шару "Конфлікти".</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="538"/>
-        <source>Empty roads/relations detected</source>
-        <translation>Знайдено порожні дороги/відношення</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="503"/>
+        <source>MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="539"/>
-        <source>Empty roads/relations are probably errors.
-Do you want to mark them for deletion?</source>
-        <translation>Порожні дороги/відношення, можливо помилка.
-Бажаєте позначити їх для вилучення?</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="526"/>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="599"/>
+        <source>Downloading points</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportOSM.cpp" line="547"/>
-        <source>Remove empty feature %1</source>
-        <translation>Вилучення порожнього елементу %1</translation>
+        <location filename="../src/Sync/DownloadOSM.cpp" line="575"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SlippyMapWidget.cpp" line="69"/>
         <source>Downloading %1,%2 (zoom %3)...</source>
         <translation>Завантажується %1,%2 (масштаб %3)…</translation>
     </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="141"/>
-        <source>Uploading...</source>
-        <translation>Відправка…</translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="166"/>
-        <source>Preparing changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Sync/DirtyListExecutorOSC.cpp" line="168"/>
-        <source>Waiting for server response</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DrawingLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="305"/>
-        <source>Close</source>
-        <translation>Закрити</translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="300"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="301"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="306"/>
+        <source>Close</source>
+        <translation>Закрити</translation>
+    </message>
 </context>
 <context>
     <name>EditInteraction</name>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="277"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="279"/>
         <source>Cannot delete the selection because it is outside the downloaded area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="280"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="282"/>
         <source>Cannot delete everything</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="281"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="283"/>
         <source>The complete selection cannot be deleted because part of it is outside the downloaded area.
 Delete what can be?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse way %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="326"/>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="328"/>
         <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -958,12 +969,12 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="101"/>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/FeaturesDock.ui" line="108"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -981,7 +992,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="30"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/FilterEditDialog.ui" line="42"/>
@@ -992,7 +1003,7 @@ Delete what can be?</source>
 <context>
     <name>FilterLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="688"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="689"/>
         <source>Close</source>
         <translation>Закрити</translation>
     </message>
@@ -1002,17 +1013,17 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="14"/>
         <source>Filters setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="20"/>
         <source>Filters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="47"/>
         <source>Filter list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="76"/>
@@ -1022,7 +1033,7 @@ Delete what can be?</source>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="93"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/FilterPreferencesDialog.ui" line="105"/>
@@ -1048,235 +1059,235 @@ Delete what can be?</source>
 <context>
     <name>GeoImageDock</name>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="86"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="970"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="78"/>
+        <source>Cannot read the photo's details from the Walking Papers server.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
+        <source>Please specify Walking Papers URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="113"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="997"/>
         <source>Geo Images</source>
         <translation>Гео-зображення</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="96"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="972"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="121"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="998"/>
+        <source>Center map</source>
+        <translation>Центрувати мапу</translation>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="122"/>
+        <source>c</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="123"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="999"/>
         <source>Remove Images</source>
         <translation>Вилучити зображення</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="97"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="973"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="124"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1000"/>
         <source>Copy filename to clipboard</source>
         <translation>Копіювати ім’я файлу до буферу обміну</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="98"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="974"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="125"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1001"/>
         <source>Select next image</source>
         <translation>Вибрати наступне зображення</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="99"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="126"/>
         <source>PgDown</source>
         <translation>PgDown</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="101"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="975"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="128"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1002"/>
         <source>Select previous image</source>
         <translation>Вибрати попереднє зображення</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="102"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="129"/>
         <source>PgUp</source>
         <translation>PgUp</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="356"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="482"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="131"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="1003"/>
+        <source>Save geotagged image...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="339"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="465"/>
+        <source>Photo layer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="383"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="509"/>
         <source>Load geotagged Images</source>
         <translation>Завантажити зображення з гео-позначками</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="357"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="483"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="384"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="510"/>
         <source>Select the layer to which the images belong:</source>
         <translation>Оберіть шар до якого належать зображення:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="397"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="523"/>
+        <source>Layer is read-only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="398"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <source>The used layer is not writeable. Should it be made writeable?
+If not, you can't load images that belong to it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Loading Images ...</source>
         <translation>Завантаження зображень:…</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="504"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="531"/>
         <source>Abort loading</source>
         <translation>Скасування завантаження</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>No such file</source>
         <translation>Немає такого файлу</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="516"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="543"/>
         <source>Can't find image "%1".</source>
         <translation>Неможливо знайти зображення "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Exiv2</source>
         <translation>Exiv2</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="524"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="551"/>
         <source>Error while opening "%2":
 %1</source>
         <translation>Помилка відкриття "%2":
 %1</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="526"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="918"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="553"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="945"/>
         <source>Error while loading EXIF-data from "%1".</source>
         <translation>Помилка завантаження EXIF-даних з "%1".</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="51"/>
-        <source>Cannot read the photo's details from the Walking Papers server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="71"/>
-        <source>Please specify Walking Papers URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="72"/>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="94"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="971"/>
-        <source>Center map</source>
-        <translation>Центрувати мапу</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="95"/>
-        <source>c</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="104"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="976"/>
-        <source>Save geotagged image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="312"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="438"/>
-        <source>Photo layer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="370"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="496"/>
-        <source>Layer is read-only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="371"/>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="497"/>
-        <source>The used layer is not writeable. Should it be made writeable?
-If not, you can't load images that belong to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="699"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="726"/>
         <source>Specify offset</source>
         <translation>Вкажіть координати</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="701"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="728"/>
         <source>Position images more to the:</source>
         <translation>Координати зображення більші за:</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="702"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="729"/>
         <source>end of the track</source>
         <translation>кінець треку</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="703"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="730"/>
         <source>beginning of the track</source>
         <translation>початок треку</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="707"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="734"/>
         <source>hh:mm:ss</source>
         <translation>гг:хх:сс</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints</source>
         <translation>Точки треку відсутні</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="765"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="792"/>
         <source>No TrackPoints found for image "%1"</source>
         <translation>Точки треку для зображення "%1" відсутні</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="772"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="799"/>
         <source>ss 'seconds'</source>
         <translation>сс 'секунд’</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="774"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="801"/>
         <source>mm 'minutes and' ss 'seconds'</source>
         <translation>хх 'хвилин’ та сс 'секунд’</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="776"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="803"/>
         <source>hh 'hours,' mm 'minutes and' ss 'seconds'</source>
         <translation>гг 'годин’, хх 'хвилин’ та сс 'секунд’</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="777"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="804"/>
         <source>Wrong image?</source>
         <translation>Помилкове зображення?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="778"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="805"/>
         <source>Image "%1" was taken %2 before the next trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Зображення "%1" отримане %2 до того як була записана подальша точка шляху.
 Ви бажаєте застосувати його?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="779"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="806"/>
         <source>Image "%1" was taken %2 after the last trackpoint was recorded.
 Do you still want to use it?</source>
         <translation>Зображення "%1" отримане %2 після того як була записана остання точка шляху.
 Ви бажаєте застосувати його?</translation>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>JPEG Images (*.jpg)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>Specify output filename</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="832"/>
-        <source>Specify output filename</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="859"/>
+        <source>JPEG Images (*.jpg)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/GeoImageDock.cpp" line="914"/>
+        <location filename="../src/Docks/GeoImageDock.cpp" line="941"/>
         <source>Error while opening "%1":
 %2</source>
         <translation>Помилка відкриття "%1":
@@ -1286,35 +1297,9 @@ Do you still want to use it?</source>
 <context>
     <name>GotoDialog</name>
     <message>
-        <location filename="../src/common/GotoDialog.cpp" line="97"/>
-        <source>Invalid OSM url</source>
-        <translation>Хибний OSM url</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="98"/>
-        <source>The specified url is invalid!</source>
-        <translation>Вказаний url — хибний!</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="106"/>
-        <location filename="../src/common/GotoDialog.cpp" line="117"/>
-        <source>Invalid Coordinates format</source>
-        <translation>Хибний формат координат</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="107"/>
-        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
-        <translation>Координати задаються рядком: '<left lon>, <bottom lat>, <right lon>, <top lat>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.cpp" line="118"/>
-        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
-        <translation>Координати задаються рядком: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
-    </message>
-    <message>
-        <location filename="../src/common/GotoDialog.ui" line="14"/>
-        <source>Go To</source>
-        <translation>Перейти до</translation>
+        <location filename="../src/common/GotoDialog.ui" line="14"/>
+        <source>Go To</source>
+        <translation>Перейти до</translation>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="28"/>
@@ -1324,17 +1309,17 @@ Do you still want to use it?</source>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="61"/>
         <source>WWW link (OSM/Google maps)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="80"/>
         <source>Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="92"/>
         <source>Show projected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/GotoDialog.ui" line="107"/>
@@ -1367,123 +1352,149 @@ Do you still want to use it?</source>
         <source>Search</source>
         <translation>Пошук</translation>
     </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="97"/>
+        <source>Invalid OSM url</source>
+        <translation>Хибний OSM url</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="98"/>
+        <source>The specified url is invalid!</source>
+        <translation>Вказаний url — хибний!</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="106"/>
+        <location filename="../src/common/GotoDialog.cpp" line="117"/>
+        <source>Invalid Coordinates format</source>
+        <translation>Хибний формат координат</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="107"/>
+        <source>Coordinates must be: '<left lon>, <bottom lat>, <right lon>, <top lat>'</source>
+        <translation>Координати задаються рядком: '<left lon>, <bottom lat>, <right lon>, <top lat>'</translation>
+    </message>
+    <message>
+        <location filename="../src/common/GotoDialog.cpp" line="118"/>
+        <source>Coordinates must be: '<center lat>, <center lon>, <span lat>, <span lon>'</source>
+        <translation>Координати задаються рядком: '<center lat>, <center lon>, <span lat>, <span lon>'</translation>
+    </message>
 </context>
 <context>
     <name>ImageLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="317"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="318"/>
         <source>None</source>
         <translation>Немає</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="324"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="325"/>
         <source>Shape adapter</source>
         <translation>Адаптер форм</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="407"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="408"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="414"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="415"/>
         <source>Set view projection to layer's</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="419"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="420"/>
         <source>Reset alignment adjustment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="424"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="425"/>
         <source>Close</source>
         <translation>Закрити</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="432"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="433"/>
         <source>WMS adapter</source>
         <translation>WMS адаптер</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="448"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="449"/>
         <source>TMS adapter</source>
         <translation>TMS адаптер</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="464"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="465"/>
         <source>Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ImageMapLayer</name>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="86"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="179"/>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="303"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="80"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="173"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="288"/>
         <source>Map - None</source>
         <translation>Мапа - Немає</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="214"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="207"/>
         <source>Map - WMS - %1</source>
         <translation>Мапа - WMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="219"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="210"/>
         <source>Map - WMS-C - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="224"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="213"/>
         <source>Map - WMS-Tiled - %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="228"/>
         <source>Map - TMS - %1</source>
         <translation>Мапа - TMS - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="252"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="240"/>
         <source>Map - %1</source>
         <translation>Мапа - %1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="277"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="265"/>
         <source>Licensing Terms: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>License Terms not accepted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="284"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="272"/>
         <source>You have not ticked the checkbox expressing your agreement with the licensing terms.
-As such, you won't be able to use this source as a map layer.
+As such, you won't be able to use this source as a map layer.
 Is it really what you meant?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1043"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1027"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1046"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1030"/>
         <source>Tile size</source>
         <translation>Розмір частин</translation>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1048"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1032"/>
         <source>Min/Max zoom</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/ImageMapLayer.cpp" line="1052"/>
+        <location filename="../src/Layers/ImageMapLayer.cpp" line="1036"/>
         <source>Projection</source>
         <translation>Проекція</translation>
     </message>
@@ -1491,104 +1502,6 @@ Is it really what you meant?</source>
 <context>
     <name>ImportCSVDialog</name>
     <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
-        <source>String</source>
-        <translation>Рядок</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
-        <source>Integer</source>
-        <translation>Ціле число</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
-        <source>Float</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
-        <source>Longitude</source>
-        <translation>Довгота</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
-        <source>Latitude</source>
-        <translation>Широта</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Invalid projection</source>
-        <translation>Помилкова проекція</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
-        <source>Unable to set projection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
-        <source>No coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
-        <source>Latitude or Longitude field missing. It will be impossible to import the file.
-Do you really want to exit?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <source>Load CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Merkaartor import settings (*.mis)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>Invalid file</source>
-        <translation>Хибний файл</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 неможливо відкрити.</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
-        <source>%1 is not a CSV import settings file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>Save CSV import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>untitled</source>
-        <translation>без назви</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
-        <source>All Files (*)</source>
-        <translation>Всі файли (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>Unable to open save import settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 неможливо відкрити для запису.</translation>
-    </message>
-    <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="14"/>
         <source>Dialog</source>
         <translation>Надсилання змін</translation>
@@ -1596,14 +1509,14 @@ Do you really want to exit?</source>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="26"/>
         <source>Input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="55"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Courier New'; font-size:9pt; font-weight:400; font-style:normal;">
 <table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
 <tr>
 <td style="border: none;">
@@ -1611,12 +1524,12 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">2</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4</span></p></td></tr></table></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="75"/>
         <source>OSM Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="93"/>
@@ -1626,7 +1539,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="105"/>
         <source>First line contains headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="112"/>
@@ -1636,7 +1549,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="124"/>
         <source>Colon (,)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="131"/>
@@ -1656,7 +1569,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="171"/>
         <source>String Quote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="177"/>
@@ -1666,17 +1579,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="184"/>
         <source>Single quote (')</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="191"/>
         <source>Double quote (")</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="214"/>
         <source>Projection (in PROJ4 format; leave blank for latitude/longitude)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="227"/>
@@ -1686,17 +1599,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="254"/>
         <source>Field list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="283"/>
         <source>Field Name (= tag key) :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="300"/>
         <source>Field Type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="310"/>
@@ -1706,40 +1619,138 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="336"/>
         <source>Import range</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="342"/>
         <source>From (0 from start):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="352"/>
         <source>To (0 to End):</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="367"/>
         <source>Load settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportCSVDialog.ui" line="374"/>
         <source>Save settings...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="32"/>
+        <source>String</source>
+        <translation>Рядок</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="33"/>
+        <source>Integer</source>
+        <translation>Ціле число</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="34"/>
+        <source>Float</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="35"/>
+        <source>Longitude</source>
+        <translation>Довгота</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="36"/>
+        <source>Latitude</source>
+        <translation>Широта</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Invalid projection</source>
+        <translation>Помилкова проекція</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="376"/>
+        <source>Unable to set projection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="395"/>
+        <source>No coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="396"/>
+        <source>Latitude or Longitude field missing. It will be impossible to import the file.
+Do you really want to exit?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <source>Load CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="433"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Merkaartor import settings (*.mis)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>Invalid file</source>
+        <translation>Хибний файл</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="439"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 неможливо відкрити.</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="452"/>
+        <source>%1 is not a CSV import settings file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>Save CSV import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>untitled</source>
+        <translation>без назви</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="544"/>
+        <source>All Files (*)</source>
+        <translation>Всі файли (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>Unable to open save import settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportCSVDialog.cpp" line="560"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 неможливо відкрити для запису.</translation>
     </message>
 </context>
 <context>
     <name>ImportExportGdal</name>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="314"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="377"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="316"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="379"/>
         <source>Unable to set projection; please specify one</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1753,22 +1764,18 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>Layer</name>
-    <message numerus="yes">
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
-        <source>%n features</source>
-        <translation type="unfinished">
-            <numerusform>%n елемент</numerusform>
-            <numerusform>%n елементи</numerusform>
-            <numerusform>%n елементів</numerusform>
-        </translation>
-    </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="408"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
         <source>Size</source>
         <translation>Розмір</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="425"/>
+        <location filename="../src/Layers/Layer.cpp" line="416"/>
+        <source>%n features</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="433"/>
         <source>Features</source>
         <translation>Елементи</translation>
     </message>
@@ -1815,81 +1822,81 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="402"/>
         <source>Map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="403"/>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
-        <source>Reset Layers to default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/LayerDock.cpp" line="404"/>
         <source>Tracks</source>
         <translation>Треки</translation>
     </message>
+    <message>
+        <location filename="../src/Docks/LayerDock.cpp" line="491"/>
+        <source>Reset Layers to default</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>LayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="172"/>
+        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Подвійна дорога</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/LayerWidget.cpp" line="173"/>
         <source>Visible</source>
         <translation>Видимий</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="178"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="179"/>
         <source>Readonly</source>
         <translation>Тільки для читання</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Low</source>
         <translation>прозорий</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>High</source>
         <translation>напівпрозорий</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="186"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="187"/>
         <source>Opaque</source>
         <translation>непрозорий</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="189"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="190"/>
         <source>Opacity</source>
         <translation>Непрозорість</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="214"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
         <source>Layer CLose: Dirty objects present</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="215"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="216"/>
         <source>There are dirty features on this layer.
 Are you sure you want to close it? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="220"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
         <source>Layer CLose: Not empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="221"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="222"/>
         <source>Are you sure you want to close this layer? (no Undo possible)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Layers/LayerWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Подвійна дорога</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1897,17 +1904,17 @@ Are you sure you want to close it? (no Undo possible)</source>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="14"/>
         <source>Licensing Terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="21"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Layers/LicenseDisplayDialog.ui" line="29"/>
         <source>I have read and agree to the licensing terms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1921,2600 +1928,2647 @@ Are you sure you want to close it? (no Undo possible)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/Main.cpp" line="210"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="242"/>
+        <source>%1 v%2
 Loading plugins...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Main.cpp" line="242"/>
-        <source>%1 v%2%3(%4)
+        <location filename="../src/Main.cpp" line="280"/>
+        <source>%1 v%2
 Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
-        <source>Clear Tag '%1' on %2</source>
-        <translation>Стерто теґ '%1' для %2</translation>
+        <location filename="../src/MainWindow.ui" line="14"/>
+        <source>Merkaartor</source>
+        <translation>Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
-        <source>Remove member '%1' on %2</source>
-        <translation>Вилучити елемент%1 з відношення %2</translation>
+        <location filename="../src/MainWindow.ui" line="32"/>
+        <source>&Help</source>
+        <translation>&Довідка</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
-        <source>Create Area Interaction</source>
-        <translation>Створити взаємозв’язки ділянки</translation>
+        <location filename="../src/MainWindow.ui" line="38"/>
+        <source>&Create</source>
+        <translation>&Створити</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
-        <source>Create Area %1</source>
-        <translation>Створити Ділянку %1</translation>
+        <location filename="../src/MainWindow.ui" line="51"/>
+        <location filename="../src/MainWindow.ui" line="632"/>
+        <source>&Road</source>
+        <translation>&Дорога</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
-        <source>Area: Create Road %1</source>
-        <translation>Ділянка: Створити дорогу %1</translation>
+        <location filename="../src/MainWindow.ui" line="70"/>
+        <source>&Edit</source>
+        <translation>П&равка</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
-        <source>Add a hole.</source>
-        <translation>Додати отвір.</translation>
+        <location filename="../src/MainWindow.ui" line="92"/>
+        <source>&View</source>
+        <translation>&Вид</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
-        <source>Do you want to add a(nother) hole to this area?</source>
-        <translation>Бажаєте додати ще один отвір до цієї ділянки?</translation>
+        <location filename="../src/MainWindow.ui" line="96"/>
+        <source>&Bookmarks</source>
+        <translation>&Закладки</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
-        <source>Area: Finish Road %1</source>
-        <translation>Ділянка: Закінчити дорогу %1</translation>
+        <location filename="../src/MainWindow.ui" line="104"/>
+        <source>Set &projection</source>
+        <translation>Встановити &проекцію</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
-        <source>Area: Add node %1 to Road %2</source>
-        <translation>Ділянка: Додати точку %1 до дороги %2</translation>
+        <location filename="../src/MainWindow.ui" line="109"/>
+        <source>Set Areas &opacity</source>
+        <translation>Встановити &прозорість ділянок</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
-        <source>Close Area %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="127"/>
+        <source>&File</source>
+        <translation>&Файл</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
-        <source>Create double way Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="131"/>
+        <source>&Export</source>
+        <translation>&Експорт</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
-        <source>Add nodes to double-way Road %1</source>
-        <translation>Додати точки до подвійної дороги %1</translation>
+        <location filename="../src/MainWindow.ui" line="141"/>
+        <source>Re&cent open</source>
+        <translation>Не&щодавно відкриті</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
-        <source>Create double-way Road %1</source>
-        <translation>Створити Подвійну дорогу %1</translation>
+        <location filename="../src/MainWindow.ui" line="146"/>
+        <source>Recen&t import</source>
+        <translation>Не&щодавно імпортовані</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
-        <source>Create node Interaction</source>
-        <translation>Створити взаємозв’язки точки</translation>
+        <location filename="../src/MainWindow.ui" line="174"/>
+        <source>T&ools</source>
+        <translation>Інстру&менти</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="259"/>
-        <source>Create node in Road: %1</source>
-        <translation>Створити точку на Дорозі %1</translation>
+        <location filename="../src/MainWindow.ui" line="178"/>
+        <source>&Style</source>
+        <translation>&Стиль</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
-        <source>Create POI %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="189"/>
+        <source>Ta&g templates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
-        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
-        <translation>ЛІВИЙ-КЛАЦ — розпочати; ТЯГТИ — зміна масштабу; SHIFT-ТЯГТИ — обертання; ЛІВИЙ-КЛАЦ — закінчити</translation>
+        <location filename="../src/MainWindow.ui" line="214"/>
+        <location filename="../src/MainWindow.ui" line="650"/>
+        <source>&Node</source>
+        <translation>&Точка</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
-        <source>Create Polygon Interaction</source>
-        <translation>Створити взаємозв’язки багатокутника</translation>
+        <location filename="../src/MainWindow.ui" line="223"/>
+        <source>&Window</source>
+        <translation>В&ікно</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
-        <source>Create Polygon %1</source>
-        <translation>Створити Багатокутник %1</translation>
+        <location filename="../src/MainWindow.ui" line="227"/>
+        <location filename="../src/MainWindow.ui" line="934"/>
+        <source>&Docks</source>
+        <translation>&Панелі</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
-        <source>Create roundabout Interaction</source>
-        <translation>Створити взаємозв’язки кільця</translation>
+        <location filename="../src/MainWindow.ui" line="246"/>
+        <source>Fea&ture</source>
+        <translation>&Елементи</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
-        <source>Create Roundabout %1</source>
-        <translation>Створити кільце %1</translation>
+        <location filename="../src/MainWindow.ui" line="250"/>
+        <location filename="../src/MainWindow.cpp" line="1118"/>
+        <source>OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
-        <source>Create way Interaction</source>
-        <translation>Створити взаємозв’язки шляху</translation>
+        <location filename="../src/MainWindow.ui" line="266"/>
+        <location filename="../src/MainWindow.ui" line="959"/>
+        <source>&Layers</source>
+        <translation>&Шари</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
-        <source>Create Node %1 in Road %2</source>
-        <translation>Створити точку %1 на Дорозі %2</translation>
+        <location filename="../src/MainWindow.ui" line="277"/>
+        <source>&Gps</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
-        <source>Create Road: %1</source>
-        <translation>Створити Дорогу: %1</translation>
+        <location filename="../src/MainWindow.ui" line="290"/>
+        <source>Rel&ation</source>
+        <translation>Від&ношення</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
-        <source>Create Node: %1</source>
-        <translation>Створити Точку: %1</translation>
+        <location filename="../src/MainWindow.ui" line="298"/>
+        <source>S&how</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
-        <source>Add Node %1 to Road %2</source>
-        <translation>Додати Точку %1 до Дороги %2</translation>
+        <location filename="../src/MainWindow.ui" line="302"/>
+        <source>Show directional &Arrows</source>
+        <translation>Показувати &вказівники напрямку</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
-        <source>Close Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="347"/>
+        <source>Main toolbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
-        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="396"/>
+        <source>&Quit</source>
+        <translation>Ви&хід</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
-        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="404"/>
+        <source>&About</source>
+        <translation>Про &Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
-        <source>Edit Interaction</source>
-        <translation>Редагування взаємозв’язків</translation>
+        <location filename="../src/MainWindow.ui" line="416"/>
+        <source>&Open</source>
+        <translation>&Відкрити</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="289"/>
-        <source>Remove feature %1</source>
-        <translation>Вилучення елементу %1</translation>
+        <location filename="../src/MainWindow.ui" line="419"/>
+        <source>Create a new document and import a file</source>
+        <translation>Створити новий документ та імпортувати файл</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
-        <source>Remove features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="422"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="302"/>
-        <source>Do you want to delete the children nodes also?
-Note that OSM nodes outside the downloaded area will be kept.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="431"/>
+        <source>Zoom &all</source>
+        <translation>Показати &все</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="327"/>
-        <source>Reverse %1 ways</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="434"/>
+        <source>F2</source>
+        <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="41"/>
-        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
-        <translation>ЛІВИЙ-КЛАЦ — виділити; ЛІВИЙ-ТЯГНИ — пересування</translation>
+        <location filename="../src/MainWindow.ui" line="439"/>
+        <source>Zoom &window</source>
+        <translation>Змінити &масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="46"/>
-        <source>Move node Interaction</source>
-        <translation>Пересування точки взаємозв’язку</translation>
+        <location filename="../src/MainWindow.ui" line="442"/>
+        <location filename="../src/MainWindow.ui" line="445"/>
+        <source>Zoom window</source>
+        <translation>Змінити масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="153"/>
-        <source>Move Nodes</source>
-        <translation>Пересунути точки</translation>
+        <location filename="../src/MainWindow.ui" line="448"/>
+        <source>F3</source>
+        <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="157"/>
-        <source>Move Node %1</source>
-        <translation>Пересунути точку %1</translation>
+        <location filename="../src/MainWindow.ui" line="457"/>
+        <source>Zoom &out</source>
+        <translation>Від&далити</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="210"/>
-        <source>Nodes at the same position found.</source>
-        <translation>Знайдено точку у тому ж місці.</translation>
+        <location filename="../src/MainWindow.ui" line="460"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
-        <source>Do you want to merge all nodes at the drop position?</source>
-        <translation>Чи бажаєте з’єднати точки у цьому місці?</translation>
+        <location filename="../src/MainWindow.ui" line="469"/>
+        <source>Zoom &in</source>
+        <translation>Набл&изити</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="220"/>
-        <location filename="../src/MainWindow.cpp" line="2747"/>
-        <source>Merge Nodes into %1</source>
-        <translation>Об’єднати точки в %1</translation>
+        <location filename="../src/MainWindow.ui" line="472"/>
+        <location filename="../src/MainWindow.ui" line="475"/>
+        <source>Zoom in</source>
+        <translation>Наблизити</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to rotate</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="478"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
-        <source>Rotate Interaction</source>
-        <translation>Обертання взаємозв’язків</translation>
+        <location filename="../src/MainWindow.ui" line="483"/>
+        <location filename="../src/MainWindow.ui" line="486"/>
+        <location filename="../src/MainWindow.ui" line="489"/>
+        <source>Curved link</source>
+        <translation>Звивисте з’єднання</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
-        <source>Rotate Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="501"/>
+        <location filename="../src/MainWindow.ui" line="1026"/>
+        <source>&Undo</source>
+        <translation>&Відміна</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
-        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
-        <translation>ЛІВИЙ-КЛАЦ — перший кут; ЛІВИЙ-ТЯГТИ — позначення ділянки; ЛІВИЙ-КЛАЦ — масштабувати</translation>
+        <location filename="../src/MainWindow.ui" line="504"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
-        <source>Zoom Interaction</source>
-        <translation>Масштабування взаємозв'язків</translation>
+        <location filename="../src/MainWindow.ui" line="513"/>
+        <source>&Redo</source>
+        <translation>&Повернути</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="222"/>
-        <source>tile %v / %m</source>
-        <translation>плитка %v / %m</translation>
+        <location filename="../src/MainWindow.ui" line="516"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1746"/>
-        <location filename="../src/MainWindow.cpp" line="376"/>
-        <source>Properties...</source>
-        <translation>Властивості…</translation>
+        <location filename="../src/MainWindow.ui" line="528"/>
+        <source>&Move</source>
+        <translation>&Пересунути</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>Cannot load Projections file</source>
-        <translation>Не можу завантажити файл Проекцій</translation>
+        <location filename="../src/MainWindow.ui" line="531"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="399"/>
-        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
-        <translation>Неможливо відкрити "Projections.xml". Припинення обробки.</translation>
+        <location filename="../src/MainWindow.ui" line="540"/>
+        <source>&Import</source>
+        <translation>&Імпортувати</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Low</source>
-        <translation>прозорий</translation>
+        <location filename="../src/MainWindow.ui" line="543"/>
+        <source>Import a file into the current document</source>
+        <translation>Імпортувати файл до поточного документу</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>High</source>
-        <translation>напівпрозорий</translation>
+        <location filename="../src/MainWindow.ui" line="552"/>
+        <source>&Download</source>
+        <translation>&Завантажити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="406"/>
-        <source>Opaque</source>
-        <translation>непрозорий</translation>
+        <location filename="../src/MainWindow.ui" line="555"/>
+        <source>Download map data for a new area</source>
+        <translation>Завантажити дані мапи для нової ділянки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1084"/>
-        <source>File</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="558"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1088"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="563"/>
+        <source>Link</source>
+        <translation>Зв’язки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1092"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="566"/>
+        <location filename="../src/MainWindow.ui" line="569"/>
+        <source>Create link</source>
+        <translation>Створити зв’язок</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1096"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="572"/>
+        <source>L</source>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1100"/>
-        <source>Directional Arrows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="584"/>
+        <source>&Select</source>
+        <translation>&Виділити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1104"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../src/MainWindow.ui" line="587"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1108"/>
-        <source>Layers</source>
-        <translation>Шари</translation>
+        <location filename="../src/MainWindow.ui" line="596"/>
+        <source>&Upload</source>
+        <translation>&Відправити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1112"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="599"/>
+        <source>Upload changes to the server</source>
+        <translation>Відправити зміни до сервера</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="572"/>
-        <location filename="../src/MainWindow.cpp" line="1116"/>
-        <source>Feature</source>
-        <translation>Елемент</translation>
+        <location filename="../src/MainWindow.ui" line="602"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="581"/>
-        <location filename="../src/MainWindow.cpp" line="1124"/>
-        <source>Node</source>
-        <translation>Точка</translation>
+        <location filename="../src/MainWindow.ui" line="614"/>
+        <source>R&emove</source>
+        <translation>Ви&лучити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1128"/>
-        <source>Way</source>
-        <translation>Шлях</translation>
+        <location filename="../src/MainWindow.ui" line="617"/>
+        <source>Remove selected features</source>
+        <translation>Вилучити виділені елементи</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="597"/>
-        <location filename="../src/MainWindow.cpp" line="1132"/>
-        <source>Relation</source>
-        <translation>Відношення</translation>
+        <location filename="../src/MainWindow.ui" line="620"/>
+        <source>Del</source>
+        <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1136"/>
-        <source>Tools</source>
-        <translation>Інструменти</translation>
+        <location filename="../src/MainWindow.ui" line="635"/>
+        <source>Create new road</source>
+        <translation>Створити нову дорогу</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1140"/>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="638"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1144"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="653"/>
+        <source>Create new node</source>
+        <translation>Створити нову точку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard invalid</source>
-        <translation>Хибні дані буферу обміну</translation>
+        <location filename="../src/MainWindow.ui" line="656"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1301"/>
-        <source>Cut Features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="668"/>
+        <source>&Reverse</source>
+        <translation>&Змінити напрямок</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1412"/>
-        <location filename="../src/MainWindow.cpp" line="1439"/>
-        <location filename="../src/MainWindow.cpp" line="1473"/>
-        <source>Clipboard do not contain valid data.</source>
-        <translation>Буфер обміну не містить відповідних даних.</translation>
+        <location filename="../src/MainWindow.ui" line="671"/>
+        <source>Reverse road direction</source>
+        <translation>Змінити напрямок дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1626"/>
-        <location filename="../src/MainWindow.cpp" line="4466"/>
-        <source>Unsaved changes</source>
-        <translation>Не збережені зміни</translation>
+        <location filename="../src/MainWindow.ui" line="680"/>
+        <source>&Go To...</source>
+        <translation>&Перейти до…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1627"/>
-        <source>The current map contains unsaved changes that will be lost when starting a new one.
-Do you want to cancel starting a new map or continue and discard the old changes?</source>
-        <translation>Поточна мапа містить не збережені зміни, що будуть втрачені, якщо почати редагування нової мапи.
-Чи бажаєте скасувати створення нової мапи або продовжити та втратити усі зміни?</translation>
+        <location filename="../src/MainWindow.ui" line="683"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1634"/>
-        <source>Unsaved Style changes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="688"/>
+        <source>&Double carriage way</source>
+        <translation>П&одвійна дорога</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1635"/>
-        <source>You have modified the current style.
-Do you want to save your changes?</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="691"/>
+        <source>Create Double carriage way</source>
+        <translation>Створити Подвійну дорогу</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1663"/>
-        <source>Waypoints</source>
-        <translation>Точки дороги</translation>
+        <location filename="../src/MainWindow.ui" line="696"/>
+        <source>R&oundabout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1679"/>
-        <source>Track %1</source>
-        <translation>Трек %1</translation>
+        <location filename="../src/MainWindow.ui" line="699"/>
+        <source>Create Roundabout</source>
+        <translation>Створити кільце</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1721"/>
-        <source>Big Fat Copyright Warning</source>
-        <translation>Велике жирне попередження про Авторські права</translation>
+        <location filename="../src/MainWindow.ui" line="711"/>
+        <source>&New</source>
+        <translation>&Новий</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1722"/>
-        <source>You are trying to import a KML file. Please be aware that:
-
- - You cannot import to OSM a KML file created from Google Earth. While you might
-   think that nodes you created from GE are yours, they are not!
-   They are still a derivative work from GE, and, as such, cannot be used in OSM.
-
- - If you downloaded it from the Internet, chances are that there is a copyright on it.
-   Please be absolutely sure that using those data in OSM is permitted by the author, or
-   that the data is public domain.
-
-If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
-
-Are you absolutely sure this KML can legally be imported in OSM?</source>
-        <translation>Ви намагаєтесь імпортувати KLM-файл. Зважте наступне:
-
- - Ви не можете імпортувати KLM-файли створені у Google Earth. Ви вважаєте,
-   що точки створені з GE ваші, насправді це на так!
-   Вони все одно лишаються похідними від GE і тому, чорт забирай, не можуть
-   бути використані в OSM.
-
- - Якщо ви завантажили їх з Інтернет, є шанс, що вони захищені авторським
-   правом. Будь ласка, переконайтесь, що у вас є дозвіл від автора на
-   їх використання в OSM або, що вони є суспільним надбанням.
-
-У разі невпевненості звертайтесь до оголошень у списках розсилки "legal" чи
-   "talk" від openstreetmap.
-
-Ви впевнені, що цей KLM-файл може буде імпортований до OSM на законних підставах?</translation>
+        <location filename="../src/MainWindow.ui" line="714"/>
+        <source>Create a new document</source>
+        <translation>Створити новий документ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <source>No valid file</source>
-        <translation>Відповідні файли відсутні</translation>
+        <location filename="../src/MainWindow.ui" line="723"/>
+        <source>&Split</source>
+        <translation>&Розділити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1785"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>%1 could not be opened.</source>
-        <translation>%1 неможливо відкрити.</translation>
+        <location filename="../src/MainWindow.ui" line="726"/>
+        <source>Split road into separate (connected) roads</source>
+        <translation>Розділити дорогу на окремі (з’єднані) дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Incoming Remote control request</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="729"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1935"/>
-        <source>Unknow action url: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="738"/>
+        <source>&Join</source>
+        <translation>&Приєднати</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1946"/>
-        <source>Open files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="741"/>
+        <source>Join connected roads to a single road</source>
+        <translation>Об’єднати з’єднанні дороги у одну дорогу</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1958"/>
-        <source>Old Qt version detected</source>
-        <translation>Виявлено стару версію Qt</translation>
+        <location filename="../src/MainWindow.ui" line="744"/>
+        <source>Alt+J</source>
+        <translation>Alt+J</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1959"/>
-        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
-For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
-        <translation>Ви використовуєте Qt версії %1, яка містить деякі відомі помилки надсилання даних до OpenStreetMap, починаючи з коду 401. Ви впевнені, що бажаєте продовжити (але ми не радимо вам це робити)?
-За докладною інформацією звертайтесь до http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="753"/>
+        <source>&Break apart</source>
+        <translation>Від&окремити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>Upload OSM</source>
-        <translation>Надсилання даних OSM</translation>
+        <location filename="../src/MainWindow.ui" line="756"/>
+        <source>Break</source>
+        <translation>Відокремити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1967"/>
-        <source>You don't seem to have specified your
-OpenStreetMap username and password.
-Do you want to do this now?</source>
-        <translation>Ви не зазначили в налаштуваннях ваш
-логін та пароль до OpenStreetMap.
-Бажаєте зробити це зараз?</translation>
+        <location filename="../src/MainWindow.ui" line="759"/>
+        <source>Break apart connected roads</source>
+        <translation>Відокремити з’єднанні дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>Error downloading</source>
-        <translation>Помилка завантаження</translation>
+        <location filename="../src/MainWindow.ui" line="762"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1989"/>
-        <location filename="../src/MainWindow.cpp" line="2003"/>
-        <location filename="../src/MainWindow.cpp" line="2060"/>
-        <source>The map could not be downloaded</source>
-        <translation>Неможливо завантажити мапу</translation>
+        <location filename="../src/MainWindow.ui" line="767"/>
+        <source>Re&lation</source>
+        <translation>&Відношення</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>Error downloading OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="770"/>
+        <source>Create Relation</source>
+        <translation>Створити Відношення</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2027"/>
-        <source>The OpenStreetBugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="782"/>
+        <source>&Area</source>
+        <translation>Ді&лянка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>Error downloading MapDust</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="785"/>
+        <source>Create new area</source>
+        <translation>Створити нову ділянку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2049"/>
-        <source>The MapDust bugs could not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="790"/>
+        <source>&Edit...</source>
+        <translation>П&равка…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Create Polygon</source>
-        <translation>Створити багатокутник</translation>
+        <location filename="../src/MainWindow.ui" line="795"/>
+        <location filename="../src/MainWindow.ui" line="893"/>
+        <source>Save &As...</source>
+        <translation>Зберегти &як…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2382"/>
-        <source>Specify the number of sides</source>
-        <translation>Вкажіть кількість кутів</translation>
+        <location filename="../src/MainWindow.ui" line="800"/>
+        <location filename="../src/MainWindow.ui" line="1398"/>
+        <source>&Load...</source>
+        <translation>&Завантажити…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2430"/>
-        <source>Join Roads</source>
-        <translation>Об’єднати дороги</translation>
+        <location filename="../src/MainWindow.ui" line="805"/>
+        <source>&Curved road</source>
+        <translation>&Звивиста дорога</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2444"/>
-        <source>Split Roads</source>
-        <translation>Розділити дороги</translation>
+        <location filename="../src/MainWindow.ui" line="814"/>
+        <source>&Preferences...</source>
+        <translation>&Параметри…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2458"/>
-        <source>Break Roads</source>
-        <translation>Відокремити дороги</translation>
+        <location filename="../src/MainWindow.ui" line="822"/>
+        <location filename="../src/MainWindow.ui" line="830"/>
+        <source>&All...</source>
+        <translation>&Все…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2472"/>
-        <source>Simplify Roads</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="825"/>
+        <location filename="../src/MainWindow.ui" line="833"/>
+        <source>Export all visible layers to a file</source>
+        <translation>Експортувати усі видимі шари до файлу</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2545"/>
-        <source>Force Feature upload</source>
-        <translation>Швидке надсилання елементів</translation>
+        <location filename="../src/MainWindow.ui" line="842"/>
+        <source>&Find...</source>
+        <translation>З&найти…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Network timeout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="845"/>
+        <source>Find</source>
+        <translation>Пошук</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2570"/>
-        <source>Cannot contact OpenStreetBugs.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="848"/>
+        <source>Find and select items</source>
+        <translation>Знайти та вибрати об’єкти</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Error closing bug</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="853"/>
+        <location filename="../src/MainWindow.ui" line="861"/>
+        <source>&Viewport...</source>
+        <translation>&Область перегляду…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2580"/>
-        <source>Cannot delete bug. Server message is:
-%1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="856"/>
+        <location filename="../src/MainWindow.ui" line="864"/>
+        <source>Export the features in the viewport to a file</source>
+        <translation>Експортувати вміст області перегляду до файлу</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2587"/>
-        <source>Create Junction</source>
-        <translation>Створити перехрестя</translation>
+        <location filename="../src/MainWindow.ui" line="869"/>
+        <source>&Add...</source>
+        <translation>&Додати…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2591"/>
-        <source>Multiple intersection.</source>
-        <translation>Багатократне перетинання.</translation>
+        <location filename="../src/MainWindow.ui" line="874"/>
+        <source>&Remove...</source>
+        <translation>&Вилучити…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2592"/>
-        <source>Those roads have multiple intersections.
-Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
-        <translation>Ці дороги мають багатократне перетинання.
-Ви все ще бажаєте створити перехрестя для кожного перетинання (небажані перехрестя після цього можна вилучити)?</translation>
+        <location filename="../src/MainWindow.ui" line="879"/>
+        <source>&Merge</source>
+        <translation>З’&єднати</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2609"/>
-        <source>Add Street Numbers</source>
-        <translation>Додати номер вулиці</translation>
+        <location filename="../src/MainWindow.ui" line="882"/>
+        <source>Node Merge</source>
+        <translation>Об’єднання точок</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <location filename="../src/MainWindow.cpp" line="2631"/>
-        <source>Number of segments to divide into</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="885"/>
+        <source>Merge the selected nodes (first selected will remain)</source>
+        <translation>З’єднати вибрані точки (залишається перша вибрана точка)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2626"/>
-        <source>Specify the number of segments</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="888"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="902"/>
+        <location filename="../src/MainWindow.ui" line="1834"/>
+        <source>&Save</source>
+        <translation>&Зберегти</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="905"/>
+        <source>Save to file</source>
+        <translation>Зберегти у файл</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="908"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="917"/>
+        <source>Download more</source>
+        <translation>Завантажити ще</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="920"/>
+        <source>Download more map data for the current area</source>
+        <translation>Завантажити більше даних мапи для поточної ділянки</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="923"/>
+        <location filename="../src/MainWindow.ui" line="926"/>
+        <source>Download the current view to the previous download layer</source>
+        <translation>Завантажити поточний вигляд до попередньо завантаженого шару</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="929"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="942"/>
+        <source>&Properties</source>
+        <translation>&Властивості</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="945"/>
+        <location filename="../src/MainWindow.ui" line="948"/>
+        <source>Hide/Show the Properties dock</source>
+        <translation>Сховати/Показати панель Властивостей</translation>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.ui" line="951"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2635"/>
-        <source>Subdivide road into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="962"/>
+        <location filename="../src/MainWindow.ui" line="965"/>
+        <source>Hide/Show the Layers dock</source>
+        <translation>Сховати/Показати панель Шарів</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2658"/>
-        <source>Axis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="968"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2659"/>
-        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="976"/>
+        <source>&Info</source>
+        <translation>&Інформація</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2666"/>
-        <source>triangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="979"/>
+        <location filename="../src/MainWindow.ui" line="982"/>
+        <source>Hide/Show the Info dock</source>
+        <translation>Сховати/Показати панель Інформації</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2667"/>
-        <source>rectangular</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="985"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2668"/>
-        <source>pentagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="994"/>
+        <source>&Align</source>
+        <translation>Ви&рівняти</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2669"/>
-        <source>hexagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="997"/>
+        <source>Align nodes</source>
+        <translation>Вирівняти точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2670"/>
-        <source>heptagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1000"/>
+        <source>Align selected nodes. First two selected give the line.</source>
+        <translation>Вирівняти обрані точки. Перші дві обрані точки створюють лінію.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2671"/>
-        <source>octagonal</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1003"/>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2675"/>
-        <source>Align onto %1 axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1012"/>
+        <source>&Spread</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2677"/>
-        <source>Align onto %1 regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1015"/>
+        <source>Spread nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2684"/>
-        <location filename="../src/MainWindow.cpp" line="2687"/>
-        <source>Unable to align to axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1018"/>
+        <source>Align and spread selected nodes equally.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2685"/>
-        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1029"/>
+        <location filename="../src/MainWindow.ui" line="1032"/>
+        <source>Hide/Show the Undo dock</source>
+        <translation>Совати/Показати панель скасування змін</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2688"/>
-        <source>Align to axes operation failed and did not converge on a solution.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1035"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2704"/>
-        <source>Bing Extract</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1043"/>
+        <source>Show &downloaded areas</source>
+        <translation>Показати &завантажені ділянки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2719"/>
-        <source>Align Nodes</source>
-        <translation>Вирівняти точки</translation>
+        <location filename="../src/MainWindow.ui" line="1046"/>
+        <source>Ctrl+Alt+A</source>
+        <translation>Ctrl+Alt+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2733"/>
-        <source>Spread Nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1055"/>
+        <source>&Copy</source>
+        <translation>&Копіювати</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2762"/>
-        <source>Detach Node %1</source>
-        <translation>Від’єднати точку %1</translation>
+        <location filename="../src/MainWindow.ui" line="1058"/>
+        <source>Copy selected features and tags to the clipboard</source>
+        <translation>Копіювати виділені елементи та теґи до буферу обміну</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2776"/>
-        <source>Add member to relation</source>
-        <translation>Додати елемент до відношення</translation>
+        <location filename="../src/MainWindow.ui" line="1061"/>
+        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
+        <translation>Копіювати теґи обраних елементів до буферу обміну, якщо елементом є точка треку — скопіювати також координати.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2788"/>
-        <source>Remove member from relation</source>
-        <translation>Вилучити елемент з відношення</translation>
+        <location filename="../src/MainWindow.ui" line="1064"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2800"/>
-        <source>Add to Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1069"/>
+        <source>Paste Tags (&Overwrite)</source>
+        <translation>Вставити теґи (&перезаписати)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2812"/>
-        <source>Join areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1072"/>
+        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
+        <translation>Вставити (та замінити) теґи з буферу обміну у виділені елементи..</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2824"/>
-        <source>Split area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1075"/>
+        <source>Ctrl+V, O</source>
+        <translation>Ctrl+V, O</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2839"/>
-        <source>Terrace area into %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1084"/>
+        <source>Paste Tags (&Merge)</source>
+        <translation>Вставити теґи (&об’єднати)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2867"/>
-        <source>Create Relation %1</source>
-        <translation>Створити Відношення %1</translation>
+        <location filename="../src/MainWindow.ui" line="1087"/>
+        <source>Paste tags</source>
+        <translation>Вставити теґи</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Save map style</source>
-        <translation>Зберегти стиль мапи</translation>
+        <location filename="../src/MainWindow.ui" line="1090"/>
+        <source>Paste tags from the clipboard (Merge with existing tags)</source>
+        <translation>Вставити теґи з буферу обміну (Об’єднати з існуючими теґами)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2952"/>
-        <source>Merkaartor map style (*.mas)</source>
-        <translation>Стиль мапи Merkaartor (*.mas)</translation>
+        <location filename="../src/MainWindow.ui" line="1093"/>
+        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
+        <translation>Об’єднати теґи з буферу обміну з теґами виділених елементів..</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2974"/>
-        <source>Load map style</source>
-        <translation>Завантажити стиль мапи</translation>
+        <location filename="../src/MainWindow.ui" line="1096"/>
+        <source>Ctrl+V, M</source>
+        <translation>Ctrl+V, M</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="183"/>
-        <location filename="../src/MainWindow.cpp" line="187"/>
-        <location filename="../src/MainWindow.cpp" line="2975"/>
-        <source>Supported formats</source>
-        <translation>Підтримувані формати</translation>
+        <location filename="../src/MainWindow.ui" line="1101"/>
+        <location filename="../src/MainWindow.ui" line="1106"/>
+        <source>Selected...</source>
+        <translation>Виділені…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="167"/>
-        <source>GPS Exchange format (*.gpx)
-</source>
-        <translation>Формат обміну GPS даними (*.gpx)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1115"/>
+        <source>Paste Feature(s)</source>
+        <translation>Вставити елемент(и)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="168"/>
-        <source>OpenStreetMap format (*.osm)
-</source>
-        <translation>Формат OpenStreetMap (*.osm)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1118"/>
+        <source>Paste</source>
+        <translation>Вставити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="169"/>
-        <source>OpenStreetMap change format (*.osc)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1121"/>
+        <source>Paste features from the clipboard</source>
+        <translation>Вставити елементи з буферу обміну</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="170"/>
-        <source>Noni GPSPlot format (*.ngt)
-</source>
-        <translation>Формат Noni GPSPlot (*.ngt)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1124"/>
+        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
+        <translation>Вставити елемент з буферу обміну; якщо ідентифікатор елементу вже присутній у документі — переписати його.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="171"/>
-        <source>NMEA GPS log format (*.nmea *.nma)
-</source>
-        <translation>Формат GPS даних NMEA (*.nmea *.nma)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1127"/>
+        <source>Ctrl+V, F</source>
+        <translation>Ctrl+V, F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="172"/>
-        <source>KML file (*.kml)
-</source>
-        <translation>Файли KML (*.kml)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1132"/>
+        <source>OSM (XML)</source>
+        <translation>OSM (XML)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="173"/>
-        <source>Comma delimited format (*.csv)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1137"/>
+        <source>OSM (Binary)</source>
+        <translation>OSM (двійковий)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="176"/>
-        <source>Geotagged images (*.jpg)
-</source>
-        <translation>Малюнки позначені геотеґами (*.jpg)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1142"/>
+        <source>&Force Upload</source>
+        <translation>&Швидке надсилання</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>ESRI Shapefile (*.shp)
-</source>
-        <translation>Шейпфайли ESRI (*.shp)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1145"/>
+        <source>Commit feature to the dirty layer</source>
+        <translation>Перенести елементи на шар-чернетку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="178"/>
-        <source>Geography Markup Language (*.gml)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1148"/>
+        <location filename="../src/MainWindow.ui" line="1151"/>
+        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
+        <translation>Перенести виділені елементи з шару, що не надсилається (наприклад, Треки) до шару-чернетки, готового до надсилання</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="180"/>
-        <source>Protobuf Binary Format (*.pbf)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1156"/>
+        <source>GPX</source>
+        <translation>GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="184"/>
-        <source>Merkaartor document (*.mdc)
-</source>
-        <translation>Документи Merkaartor  (*.mdc)
-</translation>
+        <location filename="../src/MainWindow.ui" line="1161"/>
+        <source>KML</source>
+        <translation>KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="589"/>
-        <source>Road</source>
-        <translation>Дорога</translation>
+        <location filename="../src/MainWindow.ui" line="1166"/>
+        <source>Toggle Toolbar</source>
+        <translation>Панель інструментів</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="709"/>
-        <source>Load image</source>
-        <translation>Завантажити зображення</translation>
+        <location filename="../src/MainWindow.ui" line="1169"/>
+        <location filename="../src/MainWindow.ui" line="1172"/>
+        <source>Hide/Show the Toolbar</source>
+        <translation>Сховати/Показати панель Інструментів</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="711"/>
-        <source>Add node position to image</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1177"/>
+        <source>Hide All</source>
+        <translation>Сховати все</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="713"/>
-        <source>Geotag image with this position</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1180"/>
+        <location filename="../src/MainWindow.ui" line="1188"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="715"/>
-        <source>Cancel</source>
-        <translation>Відміна</translation>
+        <location filename="../src/MainWindow.ui" line="1185"/>
+        <source>Show All</source>
+        <translation>Показати все</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="1600"/>
-        <source>Import file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1196"/>
+        <source>&Image layer</source>
+        <translation>Шар &зображень</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2976"/>
-        <source>Merkaartor map style (*.mas)
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1201"/>
+        <source>&Raster/SVG</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="2977"/>
-        <source>MapCSS stylesheet (*.css)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1209"/>
+        <source>Show &nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>Rebuild History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1212"/>
+        <source>Ctrl+Alt+P</source>
+        <translation>Ctrl+Alt+P</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <source>Save Merkaartor document</source>
-        <translation>Зберегти документ Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1220"/>
+        <source>Show na&mes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3395"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>untitled</source>
-        <translation>без назви</translation>
+        <location filename="../src/MainWindow.ui" line="1223"/>
+        <source>Ctrl+Alt+N</source>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Merkaartor documents Files (*.mdc)</source>
-        <translation>Файли документів Merkaartor (*.mdc)</translation>
+        <location filename="../src/MainWindow.ui" line="1228"/>
+        <source>&Start</source>
+        <translation>&Старт</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="185"/>
-        <location filename="../src/MainWindow.cpp" line="189"/>
-        <location filename="../src/MainWindow.cpp" line="3185"/>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>All Files (*)</source>
-        <translation>Всі файли (*)</translation>
+        <location filename="../src/MainWindow.ui" line="1231"/>
+        <source>Start GPS</source>
+        <translation>Розпочати роботу з GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3038"/>
-        <source>An attempt will be made to rebuild the history.
-No guarantee, though, and no Undo.
-Are you sure you want to try this? </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1236"/>
+        <source>&Replay...</source>
+        <translation>По&втор…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3209"/>
-        <source>Save Merkaartor template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1239"/>
+        <source>Replay GPS</source>
+        <translation>Відтворити інформацію GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <source>Unable to open save file</source>
-        <translation>Неможливо відкрити збережений файл</translation>
+        <location filename="../src/MainWindow.ui" line="1247"/>
+        <source>&GPS</source>
+        <translation>&GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3273"/>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>%1 could not be opened for writing.</source>
-        <translation>%1 неможливо відкрити для запису.</translation>
+        <location filename="../src/MainWindow.ui" line="1250"/>
+        <location filename="../src/MainWindow.ui" line="1253"/>
+        <source>Hide/Show the GPS dock</source>
+        <translation>Сховати/Показати панель GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3288"/>
-        <source>Unable to open save template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1256"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <location filename="../src/MainWindow.cpp" line="3349"/>
-        <source>Invalid file</source>
-        <translation>Хибний файл</translation>
+        <location filename="../src/MainWindow.ui" line="1264"/>
+        <source>S&top</source>
+        <translation>С&топ</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3304"/>
-        <source>%1 is not a valid Merkaartor document.</source>
-        <translation>%1 — не є вірним документом Merkaartor’а.</translation>
+        <location filename="../src/MainWindow.ui" line="1267"/>
+        <source>Stop GPS</source>
+        <translation>Зупинити роботу із GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>Export OSM</source>
-        <translation>Експорт даних OSM</translation>
+        <location filename="../src/MainWindow.ui" line="1275"/>
+        <source>&Center on GPS</source>
+        <translation>&Центрувати за GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3408"/>
-        <source>OSM Files (*.osm)</source>
-        <translation>Файли OSM (*.osm)</translation>
+        <location filename="../src/MainWindow.ui" line="1283"/>
+        <source>Show track &segments</source>
+        <translation>Показати &сегменти треку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>Export osmChange</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1286"/>
+        <source>Ctrl+Alt+T</source>
+        <translation>Ctrl+Alt+T</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3437"/>
-        <source>osmChange Files (*.osc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1294"/>
+        <source>Show &scale</source>
+        <translation>Показати &масштаб</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>Export GPX</source>
-        <translation>Експорт GPX</translation>
+        <location filename="../src/MainWindow.ui" line="1297"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3476"/>
-        <source>GPX Files (*.gpx)</source>
-        <translation>Файли GPX (*.gpx)</translation>
+        <location filename="../src/MainWindow.ui" line="1305"/>
+        <source>Show &relations</source>
+        <translation>Показати &відношення</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>Export KML</source>
-        <translation>Експорт KML</translation>
+        <location filename="../src/MainWindow.ui" line="1308"/>
+        <source>Ctrl+Alt+R</source>
+        <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3535"/>
-        <source>KML Files (*.kml)</source>
-        <translation>Файли KML (*.kml)</translation>
+        <location filename="../src/MainWindow.ui" line="1316"/>
+        <source>Show roads background</source>
+        <translation>Показати фон доріг</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3645"/>
-        <source>Feature extraction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1324"/>
+        <source>Show roads boundary</source>
+        <translation>Показати межі доріг</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3655"/>
-        <source>Extracting features...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1332"/>
+        <source>Show touchup</source>
+        <translation>Показати підказки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3738"/>
-        <source>Hide tool buttons labels</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1343"/>
+        <location filename="../src/MainWindow.ui" line="1346"/>
+        <source>Record</source>
+        <translation>Запис</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3849"/>
-        <source>%1 (int)</source>
-        <translation>%1 (int)</translation>
+        <location filename="../src/MainWindow.ui" line="1349"/>
+        <source>Record GPS</source>
+        <translation>Записати інформацію з GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3901"/>
-        <source>Add Bookmark</source>
-        <translation>Додати закладку</translation>
+        <location filename="../src/MainWindow.ui" line="1360"/>
+        <source>Pause</source>
+        <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3902"/>
-        <source>Specify the name of the bookmark.</source>
-        <translation>Вкажіть ім’я закладки.</translation>
+        <location filename="../src/MainWindow.ui" line="1363"/>
+        <source>Pause GPS</source>
+        <translation>Призупинити запис інформації з GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3905"/>
-        <source>Invalid bookmark name</source>
-        <translation>Помилкове ім’я закладки</translation>
+        <location filename="../src/MainWindow.ui" line="1371"/>
+        <source>G&eoImage</source>
+        <translation>G&eoImage</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3906"/>
-        <source>Bookmark cannot be blank.</source>
-        <translation>Закладка не може бути порожньою.</translation>
+        <location filename="../src/MainWindow.ui" line="1374"/>
+        <location filename="../src/MainWindow.ui" line="1377"/>
+        <source>Hide/Show the GeoImage dock</source>
+        <translation>Сховати/Показати панель GeoImage</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3910"/>
-        <source>Warning: Bookmark name already exists</source>
-        <translation>Попередження: закладка з таким ім’ям вже існує</translation>
+        <location filename="../src/MainWindow.ui" line="1380"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3911"/>
-        <source>Enter a new one, keep the same to overwrite or cancel.</source>
-        <translation>Введіть нове значення, лишить теж саме, щоб перезаписати або натисніть скасувати.</translation>
+        <location filename="../src/MainWindow.ui" line="1385"/>
+        <source>World OSB manager...</source>
+        <translation>Менеджер OSB World…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3949"/>
-        <source>Remove Bookmark</source>
-        <translation>Вилучити закладку</translation>
+        <location filename="../src/MainWindow.ui" line="1393"/>
+        <source>&Shortcut Editor...</source>
+        <translation>&Комбінації клавіш…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="3950"/>
-        <source>Select the bookmark to remove.</source>
-        <translation>Оберіть закладку для вилучення.</translation>
+        <location filename="../src/MainWindow.ui" line="1403"/>
+        <source>&Merge...</source>
+        <translation>З’&єднати…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Invalid projection</source>
-        <translation>Помилкова проекція</translation>
+        <location filename="../src/MainWindow.ui" line="1408"/>
+        <source>&Save...</source>
+        <translation>&Зберегти…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4010"/>
-        <location filename="../src/MainWindow.cpp" line="4019"/>
-        <source>Unable to set projection "%1".</source>
-        <translation>Неможливо встановити проекцію. "%1".</translation>
+        <location filename="../src/MainWindow.ui" line="1413"/>
+        <source>&Add member</source>
+        <translation>&Додати елемент</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4151"/>
-        <source>GPS error</source>
-        <translation>помилка GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1418"/>
+        <source>&Remove member</source>
+        <translation>&Вилучити елемент</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4152"/>
-        <source>Unable to open GPS port.</source>
-        <translation>Неможливо відкрити порт GPS.</translation>
+        <location filename="../src/MainWindow.ui" line="1426"/>
+        <source>&Never</source>
+        <translation>&ніколи</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4161"/>
-        <source>Open NMEA log file</source>
-        <translation>Відкрити файл журналу NMEA</translation>
+        <location filename="../src/MainWindow.ui" line="1434"/>
+        <source>for &Oneway roads</source>
+        <translation>для &односторонніх доріг</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Save Tag Templates</source>
-        <translation>Зберегти шаблони теґів</translation>
+        <location filename="../src/MainWindow.ui" line="1442"/>
+        <source>&Always</source>
+        <translation>&завжди</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4277"/>
-        <source>Merkaartor tag templates (*.mat)</source>
-        <translation>Шаблони теґів Merkaartor (*.mat)</translation>
+        <location filename="../src/MainWindow.ui" line="1451"/>
+        <source>&Detach</source>
+        <translation>&Від’єднати</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4296"/>
-        <location filename="../src/MainWindow.cpp" line="4310"/>
-        <source>Open Tag Templates</source>
-        <translation>Відкрити шаблони теґів</translation>
+        <location filename="../src/MainWindow.ui" line="1454"/>
+        <source>Detach node from a road</source>
+        <translation>Від’єднати точку від дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4384"/>
-        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1457"/>
+        <source>Detach a node from a Road</source>
+        <translation>Від’єднати точку від дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="14"/>
-        <source>Merkaartor</source>
-        <translation>Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1469"/>
+        <source>&Work Offline</source>
+        <translation>&Працювати оффлайн</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="32"/>
-        <source>&Help</source>
-        <translation>&Довідка</translation>
+        <location filename="../src/MainWindow.ui" line="1474"/>
+        <source>SVG</source>
+        <translation>Векторний малюнок (SVG)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="38"/>
-        <source>&Create</source>
-        <translation>&Створити</translation>
+        <location filename="../src/MainWindow.ui" line="1482"/>
+        <source>&Styles</source>
+        <translation>&Стилі</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="51"/>
-        <location filename="../src/MainWindow.ui" line="630"/>
-        <source>&Road</source>
-        <translation>&Дорога</translation>
+        <location filename="../src/MainWindow.ui" line="1485"/>
+        <location filename="../src/MainWindow.ui" line="1488"/>
+        <source>Hide/Show the Styles dock</source>
+        <translation>Сховати/Показати панель Стилів</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="70"/>
-        <source>&Edit</source>
-        <translation>П&равка</translation>
+        <location filename="../src/MainWindow.ui" line="1491"/>
+        <location filename="../src/MainWindow.ui" line="1893"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="92"/>
-        <source>&View</source>
-        <translation>&Вид</translation>
+        <location filename="../src/MainWindow.ui" line="1496"/>
+        <source>&WMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="96"/>
-        <source>&Bookmarks</source>
-        <translation>&Закладки</translation>
+        <location filename="../src/MainWindow.ui" line="1501"/>
+        <source>&TMS Servers Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="104"/>
-        <source>Set &projection</source>
-        <translation>Встановити &проекцію</translation>
+        <location filename="../src/MainWindow.ui" line="1506"/>
+        <source>&Reset Discardable dialogs status</source>
+        <translation>&Перевстановити стан діалогу Discardable</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="302"/>
-        <source>Show directional &Arrows</source>
-        <translation>Показувати &вказівники напрямку</translation>
+        <location filename="../src/MainWindow.ui" line="1515"/>
+        <source>GPS Menu</source>
+        <translation>Меню GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="109"/>
-        <source>Set Areas &opacity</source>
-        <translation>Встановити &прозорість ділянок</translation>
+        <location filename="../src/MainWindow.ui" line="1524"/>
+        <source>Camera</source>
+        <translation>Камера</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="127"/>
-        <source>&File</source>
-        <translation>&Файл</translation>
+        <location filename="../src/MainWindow.ui" line="1529"/>
+        <source>Create &Junction</source>
+        <translation>Створити &перехрестя</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="131"/>
-        <source>&Export</source>
-        <translation>&Експорт</translation>
+        <location filename="../src/MainWindow.ui" line="1541"/>
+        <source>Rotate</source>
+        <translation>Обертання</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="141"/>
-        <source>Re&cent open</source>
-        <translation>Не&щодавно відкриті</translation>
+        <location filename="../src/MainWindow.ui" line="1544"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="146"/>
-        <source>Recen&t import</source>
-        <translation>Не&щодавно імпортовані</translation>
+        <location filename="../src/MainWindow.ui" line="1549"/>
+        <source>&Polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="174"/>
-        <source>T&ools</source>
-        <translation>Інстру&менти</translation>
+        <location filename="../src/MainWindow.ui" line="1554"/>
+        <source>Rectangular &building</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="178"/>
-        <source>&Style</source>
-        <translation>&Стиль</translation>
+        <location filename="../src/MainWindow.ui" line="1559"/>
+        <source>Add new &Image layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="214"/>
-        <location filename="../src/MainWindow.ui" line="648"/>
-        <source>&Node</source>
-        <translation>&Точка</translation>
+        <location filename="../src/MainWindow.ui" line="1567"/>
+        <source>Features</source>
+        <translation>Елементи</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="223"/>
-        <source>&Window</source>
-        <translation>В&ікно</translation>
+        <location filename="../src/MainWindow.ui" line="1572"/>
+        <source>Add street &numbers (Karlsruhe scheme)</source>
+        <translation>&Додати номер вулиці (схема Карлсрує)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="227"/>
-        <location filename="../src/MainWindow.ui" line="932"/>
-        <source>&Docks</source>
-        <translation>&Панелі</translation>
+        <location filename="../src/MainWindow.ui" line="1581"/>
+        <source>&Subdivide</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="246"/>
-        <source>Fea&ture</source>
-        <translation>&Елементи</translation>
+        <location filename="../src/MainWindow.ui" line="1584"/>
+        <source>Subdivide segment equally</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="250"/>
-        <location filename="../src/MainWindow.cpp" line="1120"/>
-        <source>OpenStreetBugs</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1587"/>
+        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="266"/>
-        <location filename="../src/MainWindow.ui" line="957"/>
-        <source>&Layers</source>
-        <translation>&Шари</translation>
+        <location filename="../src/MainWindow.ui" line="1595"/>
+        <source>Show &virtual nodes</source>
+        <translation>Показувати в&ірутальні точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="277"/>
-        <source>&Gps</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.ui" line="1603"/>
+        <source>Show lat/lon &grid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="290"/>
-        <source>Rel&ation</source>
-        <translation>Від&ношення</translation>
+        <location filename="../src/MainWindow.ui" line="1611"/>
+        <source>&Lock zoom to tiled background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="298"/>
-        <source>S&how</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.ui" line="1616"/>
+        <source>&Projections Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="394"/>
-        <source>&Quit</source>
-        <translation>Ви&хід</translation>
+        <location filename="../src/MainWindow.ui" line="1624"/>
+        <source>Show &Photos on map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="402"/>
-        <source>&About</source>
-        <translation>Про &Merkaartor</translation>
+        <location filename="../src/MainWindow.ui" line="1629"/>
+        <source>OsmChange (OSC)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="414"/>
-        <source>&Open</source>
-        <translation>&Відкрити</translation>
+        <location filename="../src/MainWindow.ui" line="1634"/>
+        <source>Force Delete</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="417"/>
-        <source>Create a new document and import a file</source>
-        <translation>Створити новий документ та імпортувати файл</translation>
+        <location filename="../src/MainWindow.ui" line="1639"/>
+        <source>Add OpenStreet&Bugs layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="420"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
+        <location filename="../src/MainWindow.ui" line="1644"/>
+        <source>Close</source>
+        <translation>Закрити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="429"/>
-        <source>Zoom &all</source>
-        <translation>Показати &все</translation>
+        <location filename="../src/MainWindow.ui" line="1649"/>
+        <source>S&implify</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="432"/>
-        <source>F2</source>
-        <translation>F2</translation>
+        <location filename="../src/MainWindow.ui" line="1652"/>
+        <source>Simplify road(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="437"/>
-        <source>Zoom &window</source>
-        <translation>Змінити &масштаб</translation>
+        <location filename="../src/MainWindow.ui" line="1655"/>
+        <source>Simplify way by removing unnecessary child nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="440"/>
-        <location filename="../src/MainWindow.ui" line="443"/>
-        <source>Zoom window</source>
-        <translation>Змінити масштаб</translation>
+        <location filename="../src/MainWindow.ui" line="1660"/>
+        <source>&Filters Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="446"/>
-        <source>F3</source>
-        <translation>F3</translation>
+        <location filename="../src/MainWindow.ui" line="1668"/>
+        <source>&None</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="455"/>
-        <source>Zoom &out</source>
-        <translation>Від&далити</translation>
+        <location filename="../src/MainWindow.ui" line="1677"/>
+        <source>&Join Areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="458"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../src/MainWindow.ui" line="1680"/>
+        <source>Join touching areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="467"/>
-        <source>Zoom &in</source>
-        <translation>Набл&изити</translation>
+        <location filename="../src/MainWindow.ui" line="1683"/>
+        <source>Join areas which are touching.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="470"/>
-        <location filename="../src/MainWindow.ui" line="473"/>
-        <source>Zoom in</source>
-        <translation>Наблизити</translation>
+        <location filename="../src/MainWindow.ui" line="1692"/>
+        <source>&Split Area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="476"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../src/MainWindow.ui" line="1695"/>
+        <source>Split area between two nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="481"/>
-        <location filename="../src/MainWindow.ui" line="484"/>
-        <location filename="../src/MainWindow.ui" line="487"/>
-        <source>Curved link</source>
-        <translation>Звивисте з’єднання</translation>
+        <location filename="../src/MainWindow.ui" line="1698"/>
+        <source>Split a selected area between two selected nodes into two separate areas.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="499"/>
-        <location filename="../src/MainWindow.ui" line="1024"/>
-        <source>&Undo</source>
-        <translation>&Відміна</translation>
+        <location filename="../src/MainWindow.ui" line="1707"/>
+        <source>&Terrace</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="502"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+        <location filename="../src/MainWindow.ui" line="1710"/>
+        <source>Terrace area into residences</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/MainWindow.ui" line="511"/>
-        <source>&Redo</source>
-        <translation>&Повернути</translation>
+    <message>
+        <location filename="../src/MainWindow.ui" line="1713"/>
+        <source>Split a selected area into terraced residences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="514"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
+        <location filename="../src/MainWindow.ui" line="1718"/>
+        <source>Toolbar Editor...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="526"/>
-        <source>&Move</source>
-        <translation>&Пересунути</translation>
+        <location filename="../src/MainWindow.ui" line="1727"/>
+        <source>A&xis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="529"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
+        <location filename="../src/MainWindow.ui" line="1730"/>
+        <source>Align edges to regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="538"/>
-        <source>&Import</source>
-        <translation>&Імпортувати</translation>
+        <location filename="../src/MainWindow.ui" line="1733"/>
+        <source>Align edges to a certain number of regularly spaced axes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="541"/>
-        <source>Import a file into the current document</source>
-        <translation>Імпортувати файл до поточного документу</translation>
+        <location filename="../src/MainWindow.ui" line="1738"/>
+        <source>&Print...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="550"/>
-        <source>&Download</source>
-        <translation>&Завантажити</translation>
+        <location filename="../src/MainWindow.ui" line="1743"/>
+        <source>Print preview...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="553"/>
-        <source>Download map data for a new area</source>
-        <translation>Завантажити дані мапи для нової ділянки</translation>
+        <location filename="../src/MainWindow.ui" line="1748"/>
+        <location filename="../src/MainWindow.cpp" line="400"/>
+        <source>Properties...</source>
+        <translation>Властивості…</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="556"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
+        <location filename="../src/MainWindow.ui" line="1756"/>
+        <source>Highlight dirt&y features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="561"/>
-        <source>Link</source>
-        <translation>Зв’язки</translation>
+        <location filename="../src/MainWindow.ui" line="1761"/>
+        <source>Add new &Drawing layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="564"/>
-        <location filename="../src/MainWindow.ui" line="567"/>
-        <source>Create link</source>
-        <translation>Створити зв’язок</translation>
+        <location filename="../src/MainWindow.ui" line="1770"/>
+        <source>Cu&t</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="570"/>
-        <source>L</source>
-        <translation>L</translation>
+        <location filename="../src/MainWindow.ui" line="1773"/>
+        <source>Ctrl+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="582"/>
-        <source>&Select</source>
-        <translation>&Виділити</translation>
+        <location filename="../src/MainWindow.ui" line="1778"/>
+        <source>Add new &Filter layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="585"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+        <location filename="../src/MainWindow.ui" line="1786"/>
+        <source>E&xtrude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="594"/>
-        <source>&Upload</source>
-        <translation>&Відправити</translation>
+        <location filename="../src/MainWindow.ui" line="1789"/>
+        <source>Extrude interaction for ways (JOSM style)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="597"/>
-        <source>Upload changes to the server</source>
-        <translation>Відправити зміни до сервера</translation>
+        <location filename="../src/MainWindow.ui" line="1792"/>
+        <source>Alt+X</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="600"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <location filename="../src/MainWindow.ui" line="1797"/>
+        <source>Select toggle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="612"/>
-        <source>R&emove</source>
-        <translation>Ви&лучити</translation>
+        <location filename="../src/MainWindow.ui" line="1802"/>
+        <source>Include children in selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="615"/>
-        <source>Remove selected features</source>
-        <translation>Вилучити виділені елементи</translation>
+        <location filename="../src/MainWindow.ui" line="1814"/>
+        <source>Scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="618"/>
-        <source>Del</source>
-        <translation>Del</translation>
+        <location filename="../src/MainWindow.ui" line="1819"/>
+        <source>Save as Template Document...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="633"/>
-        <source>Create new road</source>
-        <translation>Створити нову дорогу</translation>
+        <location filename="../src/MainWindow.ui" line="1824"/>
+        <source>Create Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="636"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+        <location filename="../src/MainWindow.ui" line="1829"/>
+        <source>Add to Multi&polygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="651"/>
-        <source>Create new node</source>
-        <translation>Створити нову точку</translation>
+        <location filename="../src/MainWindow.ui" line="1839"/>
+        <source>GDAL SQLite/SpatiLite</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="654"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+        <location filename="../src/MainWindow.ui" line="1844"/>
+        <source>Bing Road Detector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="666"/>
-        <source>&Reverse</source>
-        <translation>&Змінити напрямок</translation>
+        <location filename="../src/MainWindow.ui" line="1849"/>
+        <source>Rebuild &History</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="669"/>
-        <source>Reverse road direction</source>
-        <translation>Змінити напрямок дороги</translation>
+        <location filename="../src/MainWindow.ui" line="1854"/>
+        <source>Add Map&Dust layer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="678"/>
-        <source>&Go To...</source>
-        <translation>&Перейти до…</translation>
+        <location filename="../src/MainWindow.ui" line="1862"/>
+        <source>Wireframe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="681"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
+        <location filename="../src/MainWindow.ui" line="1865"/>
+        <source>Ctrl+Alt+W</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="686"/>
-        <source>&Double carriage way</source>
-        <translation>П&одвійна дорога</translation>
+        <location filename="../src/MainWindow.ui" line="1870"/>
+        <source>Select parent(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="689"/>
-        <source>Create Double carriage way</source>
-        <translation>Створити Подвійну дорогу</translation>
+        <location filename="../src/MainWindow.ui" line="1875"/>
+        <source>Download missing children</source>
+        <translation>Завантажити відсутніх нащадків</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="697"/>
-        <source>Create Roundabout</source>
-        <translation>Створити кільце</translation>
+        <location filename="../src/MainWindow.ui" line="1887"/>
+        <source>&Bridge</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="709"/>
-        <source>&New</source>
-        <translation>&Новий</translation>
+        <location filename="../src/MainWindow.ui" line="1890"/>
+        <source><html><head/><body><p>Transform way to a bridge</p></body></html></source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="712"/>
-        <source>Create a new document</source>
-        <translation>Створити новий документ</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="712"/>
+        <source>Clear Tag '%1' on %2</source>
+        <translation>Стерто теґ '%1' для %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="721"/>
-        <source>&Split</source>
-        <translation>&Розділити</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
+        <source>Clear %1 tags on %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="724"/>
-        <source>Split road into separate (connected) roads</source>
-        <translation>Розділити дорогу на окремі (з’єднані) дороги</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
+        <source>Set "source" tag on %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="727"/>
-        <source>Alt+S</source>
-        <translation>Alt+S</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="776"/>
+        <source>Remove member '%1' on %2</source>
+        <translation>Вилучити елемент%1 з відношення %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="736"/>
-        <source>&Join</source>
-        <translation>&Приєднати</translation>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
+        <source>Reorder members in relation %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="739"/>
-        <source>Join connected roads to a single road</source>
-        <translation>Об’єднати з’єднанні дороги у одну дорогу</translation>
+        <location filename="../src/Features/Relation.cpp" line="795"/>
+        <source>Relation Modified %1</source>
+        <translation>Відношення %1 змінено</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="742"/>
-        <source>Alt+J</source>
-        <translation>Alt+J</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="36"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="33"/>
+        <source>Create node Interaction</source>
+        <translation>Створити взаємозв’язки точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="751"/>
-        <source>&Break apart</source>
-        <translation>Від&окремити</translation>
+        <location filename="../src/Interactions/BuildBridgeInteraction.cpp" line="158"/>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="112"/>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="260"/>
+        <source>Create node in Road: %1</source>
+        <translation>Створити точку на Дорозі %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="754"/>
-        <source>Break</source>
-        <translation>Відокремити</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="37"/>
+        <source>Create Area Interaction</source>
+        <translation>Створити взаємозв’язки ділянки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="757"/>
-        <source>Break apart connected roads</source>
-        <translation>Відокремити з’єднанні дороги</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="105"/>
+        <source>Create Area %1</source>
+        <translation>Створити Ділянку %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="760"/>
-        <source>Alt+B</source>
-        <translation>Alt+B</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="140"/>
+        <source>Area: Create Road %1</source>
+        <translation>Ділянка: Створити дорогу %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="765"/>
-        <source>Re&lation</source>
-        <translation>&Відношення</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="168"/>
+        <source>Add a hole.</source>
+        <translation>Додати отвір.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="768"/>
-        <source>Create Relation</source>
-        <translation>Створити Відношення</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="169"/>
+        <source>Do you want to add a(nother) hole to this area?</source>
+        <translation>Бажаєте додати ще один отвір до цієї ділянки?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="780"/>
-        <source>&Area</source>
-        <translation>Ді&лянка</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="173"/>
+        <source>Area: Finish Road %1</source>
+        <translation>Ділянка: Закінчити дорогу %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="783"/>
-        <source>Create new area</source>
-        <translation>Створити нову ділянку</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="188"/>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="199"/>
+        <source>Area: Add node %1 to Road %2</source>
+        <translation>Ділянка: Додати точку %1 до дороги %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="788"/>
-        <source>&Edit...</source>
-        <translation>П&равка…</translation>
+        <location filename="../src/Interactions/CreateAreaInteraction.cpp" line="269"/>
+        <source>Close Area %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1406"/>
-        <source>&Save...</source>
-        <translation>&Зберегти…</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="49"/>
+        <source>Create double way Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="798"/>
-        <location filename="../src/MainWindow.ui" line="1396"/>
-        <source>&Load...</source>
-        <translation>&Завантажити…</translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="173"/>
+        <source>Add nodes to double-way Road %1</source>
+        <translation>Додати точки до подвійної дороги %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="694"/>
-        <source>R&oundabout</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/CreateDoubleWayInteraction.cpp" line="224"/>
+        <source>Create double-way Road %1</source>
+        <translation>Створити Подвійну дорогу %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="803"/>
-        <source>&Curved road</source>
-        <translation>&Звивиста дорога</translation>
+        <location filename="../src/Interactions/CreateNodeInteraction.cpp" line="121"/>
+        <source>Create POI %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="812"/>
-        <source>&Preferences...</source>
-        <translation>&Параметри…</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="36"/>
+        <source>LEFT-CLICK to start;DRAG to scale;SHIFT-DRAG to rotate;LEFT-CLICK to end</source>
+        <translation>ЛІВИЙ-КЛАЦ — розпочати; ТЯГТИ — зміна масштабу; SHIFT-ТЯГТИ — обертання; ЛІВИЙ-КЛАЦ — закінчити</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="820"/>
-        <location filename="../src/MainWindow.ui" line="828"/>
-        <source>&All...</source>
-        <translation>&Все…</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="41"/>
+        <source>Create Polygon Interaction</source>
+        <translation>Створити взаємозв’язки багатокутника</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="823"/>
-        <location filename="../src/MainWindow.ui" line="831"/>
-        <source>Export all visible layers to a file</source>
-        <translation>Експортувати усі видимі шари до файлу</translation>
+        <location filename="../src/Interactions/CreatePolygonInteraction.cpp" line="90"/>
+        <source>Create Polygon %1</source>
+        <translation>Створити Багатокутник %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="840"/>
-        <source>&Find...</source>
-        <translation>З&найти…</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="50"/>
+        <source>Create roundabout Interaction</source>
+        <translation>Створити взаємозв’язки кільця</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="843"/>
-        <source>Find</source>
-        <translation>Пошук</translation>
+        <location filename="../src/Interactions/CreateRoundaboutInteraction.cpp" line="89"/>
+        <source>Create Roundabout %1</source>
+        <translation>Створити кільце %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="846"/>
-        <source>Find and select items</source>
-        <translation>Знайти та вибрати об’єкти</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="59"/>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="43"/>
+        <source>Create way Interaction</source>
+        <translation>Створити взаємозв’язки шляху</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="851"/>
-        <location filename="../src/MainWindow.ui" line="859"/>
-        <source>&Viewport...</source>
-        <translation>&Область перегляду…</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="238"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="298"/>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="309"/>
+        <source>Create Node %1 in Road %2</source>
+        <translation>Створити точку %1 на Дорозі %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="854"/>
-        <location filename="../src/MainWindow.ui" line="862"/>
-        <source>Export the features in the viewport to a file</source>
-        <translation>Експортувати вміст області перегляду до файлу</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="282"/>
+        <source>Create Road: %1</source>
+        <translation>Створити Дорогу: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="867"/>
-        <source>&Add...</source>
-        <translation>&Додати…</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="290"/>
+        <source>Create Node: %1</source>
+        <translation>Створити Точку: %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="872"/>
-        <source>&Remove...</source>
-        <translation>&Вилучити…</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="312"/>
+        <source>Add Node %1 to Road %2</source>
+        <translation>Додати Точку %1 до Дороги %2</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="877"/>
-        <source>&Merge</source>
-        <translation>З’&єднати</translation>
+        <location filename="../src/Interactions/CreateSingleWayInteraction.cpp" line="351"/>
+        <source>Close Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="880"/>
-        <source>Node Merge</source>
-        <translation>Об’єднання точок</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="52"/>
+        <source>LEFT-CLICK to select;RIGHT-CLICK to pan;CTRL-LEFT-CLICK to toggle selection;SHIFT-LEFT-CLICK to add to selection;LEFT-DRAG for area selection;CTRL-RIGHT-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="883"/>
-        <source>Merge the selected nodes (first selected will remain)</source>
-        <translation>З’єднати вибрані точки (залишається перша вибрана точка)</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="54"/>
+        <source>CLICK to select/move;CTRL-CLICK to toggle selection;SHIFT-CLICK to add to selection;SHIFT-DRAG for area selection;CTRL-DRAG for zoom;DOUBLE-CLICK to create a node;DOUBLE-CLICK on a node to start a way;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="886"/>
-        <source>Alt+M</source>
-        <translation>Alt+M</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="59"/>
+        <source>Edit Interaction</source>
+        <translation>Редагування взаємозв’язків</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="793"/>
-        <location filename="../src/MainWindow.ui" line="891"/>
-        <source>Save &As...</source>
-        <translation>Зберегти &як…</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="291"/>
+        <source>Remove feature %1</source>
+        <translation>Вилучення елементу %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="900"/>
-        <location filename="../src/MainWindow.ui" line="1832"/>
-        <source>&Save</source>
-        <translation>&Зберегти</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="293"/>
+        <source>Remove features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="903"/>
-        <source>Save to file</source>
-        <translation>Зберегти у файл</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="303"/>
+        <source>Delete Children.</source>
+        <translation>Вилучити нащадків.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="906"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="304"/>
+        <source>Do you want to delete the children nodes also?
+Note that OSM nodes outside the downloaded area will be kept.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="915"/>
-        <source>Download more</source>
-        <translation>Завантажити ще</translation>
+        <location filename="../src/Interactions/EditInteraction.cpp" line="329"/>
+        <source>Reverse %1 ways</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="918"/>
-        <source>Download more map data for the current area</source>
-        <translation>Завантажити більше даних мапи для поточної ділянки</translation>
+        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="133"/>
+        <source>Extrude Road %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="921"/>
-        <location filename="../src/MainWindow.ui" line="924"/>
-        <source>Download the current view to the previous download layer</source>
-        <translation>Завантажити поточний вигляд до попередньо завантаженого шару</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="42"/>
+        <source>LEFT-CLICK to select;LEFT-DRAG to move</source>
+        <translation>ЛІВИЙ-КЛАЦ — виділити; ЛІВИЙ-ТЯГНИ — пересування</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="927"/>
-        <source>Ctrl+Shift+D</source>
-        <translation>Ctrl+Shift+D</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="47"/>
+        <source>Move node Interaction</source>
+        <translation>Пересування точки взаємозв’язку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="940"/>
-        <source>&Properties</source>
-        <translation>&Властивості</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="154"/>
+        <source>Move Nodes</source>
+        <translation>Пересунути точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="943"/>
-        <location filename="../src/MainWindow.ui" line="946"/>
-        <source>Hide/Show the Properties dock</source>
-        <translation>Сховати/Показати панель Властивостей</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="158"/>
+        <source>Move Node %1</source>
+        <translation>Пересунути точку %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="949"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="211"/>
+        <source>Nodes at the same position found.</source>
+        <translation>Знайдено точку у тому ж місці.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="960"/>
-        <location filename="../src/MainWindow.ui" line="963"/>
-        <source>Hide/Show the Layers dock</source>
-        <translation>Сховати/Показати панель Шарів</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="212"/>
+        <source>Do you want to merge all nodes at the drop position?</source>
+        <translation>Чи бажаєте з’єднати точки у цьому місці?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="966"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+        <location filename="../src/Interactions/MoveNodeInteraction.cpp" line="221"/>
+        <location filename="../src/MainWindow.cpp" line="2808"/>
+        <source>Merge Nodes into %1</source>
+        <translation>Об’єднати точки в %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="974"/>
-        <source>&Info</source>
-        <translation>&Інформація</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to rotate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="977"/>
-        <location filename="../src/MainWindow.ui" line="980"/>
-        <source>Hide/Show the Info dock</source>
-        <translation>Сховати/Показати панель Інформації</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="44"/>
+        <source>Rotate Interaction</source>
+        <translation>Обертання взаємозв’язків</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="983"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../src/Interactions/RotateInteraction.cpp" line="139"/>
+        <source>Rotate Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="992"/>
-        <source>&Align</source>
-        <translation>Ви&рівняти</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
+        <source>HOVER to select;LEFT-DRAG to scale</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="995"/>
-        <source>Align nodes</source>
-        <translation>Вирівняти точки</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
+        <source>Scale Interaction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="998"/>
-        <source>Align selected nodes. First two selected give the line.</source>
-        <translation>Вирівняти обрані точки. Перші дві обрані точки створюють лінію.</translation>
+        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
+        <source>Scale Feature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1001"/>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="27"/>
+        <source>LEFT-CLICK to first corner -> LEFT-DRAG to specify area -> LEFT-CLICK to zoom</source>
+        <translation>ЛІВИЙ-КЛАЦ — перший кут; ЛІВИЙ-ТЯГТИ — позначення ділянки; ЛІВИЙ-КЛАЦ — масштабувати</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1010"/>
-        <source>&Spread</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Interactions/ZoomInteraction.cpp" line="30"/>
+        <source>Zoom Interaction</source>
+        <translation>Масштабування взаємозв'язків</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1013"/>
-        <source>Spread nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="191"/>
+        <source>GPS Exchange format (*.gpx)
+</source>
+        <translation>Формат обміну GPS даними (*.gpx)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1016"/>
-        <source>Align and spread selected nodes equally.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="192"/>
+        <source>OpenStreetMap format (*.osm)
+</source>
+        <translation>Формат OpenStreetMap (*.osm)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1027"/>
-        <location filename="../src/MainWindow.ui" line="1030"/>
-        <source>Hide/Show the Undo dock</source>
-        <translation>Совати/Показати панель скасування змін</translation>
+        <location filename="../src/MainWindow.cpp" line="193"/>
+        <source>OpenStreetMap change format (*.osc)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1033"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+        <location filename="../src/MainWindow.cpp" line="194"/>
+        <source>Noni GPSPlot format (*.ngt)
+</source>
+        <translation>Формат Noni GPSPlot (*.ngt)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1041"/>
-        <source>Show &downloaded areas</source>
-        <translation>Показати &завантажені ділянки</translation>
+        <location filename="../src/MainWindow.cpp" line="195"/>
+        <source>NMEA GPS log format (*.nmea *.nma)
+</source>
+        <translation>Формат GPS даних NMEA (*.nmea *.nma)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1044"/>
-        <source>Ctrl+Alt+A</source>
-        <translation>Ctrl+Alt+A</translation>
+        <location filename="../src/MainWindow.cpp" line="196"/>
+        <source>KML file (*.kml)
+</source>
+        <translation>Файли KML (*.kml)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1053"/>
-        <source>&Copy</source>
-        <translation>&Копіювати</translation>
+        <location filename="../src/MainWindow.cpp" line="197"/>
+        <source>Comma delimited format (*.csv)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1056"/>
-        <source>Copy selected features and tags to the clipboard</source>
-        <translation>Копіювати виділені елементи та теґи до буферу обміну</translation>
+        <location filename="../src/MainWindow.cpp" line="200"/>
+        <source>Geotagged images (*.jpg)
+</source>
+        <translation>Малюнки позначені геотеґами (*.jpg)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1059"/>
-        <source>Copy the selected feature's tags to the clipboard; if the feature is a trackpoint, copy the coordinates, too.</source>
-        <translation>Копіювати теґи обраних елементів до буферу обміну, якщо елементом є точка треку — скопіювати також координати.</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>ESRI Shapefile (*.shp)
+</source>
+        <translation>Шейпфайли ESRI (*.shp)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1062"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <location filename="../src/MainWindow.cpp" line="202"/>
+        <source>Geography Markup Language (*.gml)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1067"/>
-        <source>Paste Tags (&Overwrite)</source>
-        <translation>Вставити теґи (&перезаписати)</translation>
+        <location filename="../src/MainWindow.cpp" line="204"/>
+        <source>Protobuf Binary Format (*.pbf)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1070"/>
-        <source>Paste (and overwrite) the tags in the clipboard to the selected feature.</source>
-        <translation>Вставити (та замінити) теґи з буферу обміну у виділені елементи..</translation>
+        <location filename="../src/MainWindow.cpp" line="207"/>
+        <location filename="../src/MainWindow.cpp" line="211"/>
+        <location filename="../src/MainWindow.cpp" line="3024"/>
+        <source>Supported formats</source>
+        <translation>Підтримувані формати</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1073"/>
-        <source>Ctrl+V, O</source>
-        <translation>Ctrl+V, O</translation>
+        <location filename="../src/MainWindow.cpp" line="208"/>
+        <source>Merkaartor document (*.mdc)
+</source>
+        <translation>Документи Merkaartor  (*.mdc)
+</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1082"/>
-        <source>Paste Tags (&Merge)</source>
-        <translation>Вставити теґи (&об’єднати)</translation>
+        <location filename="../src/MainWindow.cpp" line="209"/>
+        <location filename="../src/MainWindow.cpp" line="213"/>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>All Files (*)</source>
+        <translation>Всі файли (*)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1085"/>
-        <source>Paste tags</source>
-        <translation>Вставити теґи</translation>
+        <location filename="../src/MainWindow.cpp" line="246"/>
+        <source>tile %v / %m</source>
+        <translation>плитка %v / %m</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1088"/>
-        <source>Paste tags from the clipboard (Merge with existing tags)</source>
-        <translation>Вставити теґи з буферу обміну (Об’єднати з існуючими теґами)</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>Cannot load Projections file</source>
+        <translation>Не можу завантажити файл Проекцій</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1091"/>
-        <source>Merge the tags in the clipboard with the ones of the selected feature.</source>
-        <translation>Об’єднати теґи з буферу обміну з теґами виділених елементів..</translation>
+        <location filename="../src/MainWindow.cpp" line="423"/>
+        <source>"Projections.xml" could not be opened anywhere. Aborting.</source>
+        <translation>Неможливо відкрити "Projections.xml". Припинення обробки.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1094"/>
-        <source>Ctrl+V, M</source>
-        <translation>Ctrl+V, M</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Low</source>
+        <translation>прозорий</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1099"/>
-        <location filename="../src/MainWindow.ui" line="1104"/>
-        <source>Selected...</source>
-        <translation>Виділені…</translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>High</source>
+        <translation>напівпрозорий</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1547"/>
-        <source>&Polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="430"/>
+        <source>Opaque</source>
+        <translation>непрозорий</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1552"/>
-        <source>Rectangular &building</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="597"/>
+        <location filename="../src/MainWindow.cpp" line="1117"/>
+        <source>Feature</source>
+        <translation>Елемент</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1557"/>
-        <source>Add new &Image layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="606"/>
+        <location filename="../src/MainWindow.cpp" line="1119"/>
+        <source>Node</source>
+        <translation>Точка</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1637"/>
-        <source>Add OpenStreet&Bugs layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="614"/>
+        <source>Road</source>
+        <translation>Дорога</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1696"/>
-        <source>Split a selected area between two selected nodes into two separate areas.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="622"/>
+        <location filename="../src/MainWindow.cpp" line="1121"/>
+        <source>Relation</source>
+        <translation>Відношення</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1725"/>
-        <source>A&xis Align</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="738"/>
+        <source>Load image</source>
+        <translation>Завантажити зображення</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1728"/>
-        <source>Align edges to regular axes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="740"/>
+        <source>Add node position to image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1731"/>
-        <source>Align edges to a certain number of regularly spaced axes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="742"/>
+        <source>Geotag image with this position</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1736"/>
-        <source>&Print...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="744"/>
+        <source>Cancel</source>
+        <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1741"/>
-        <source>Print preview...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1109"/>
+        <source>File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1754"/>
-        <source>Highlight dirt&y features</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1110"/>
+        <source>Edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1759"/>
-        <source>Add new &Drawing layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1111"/>
+        <source>View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1776"/>
-        <source>Add new &Filter layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1112"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1822"/>
-        <source>Create Multipolygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1113"/>
+        <source>Directional Arrows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1827"/>
-        <source>Add to Multi&polygon</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1114"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1837"/>
-        <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1115"/>
+        <source>Layers</source>
+        <translation>Шари</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1842"/>
-        <source>Bing Road Detector</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1116"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1847"/>
-        <source>Rebuild &History</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1120"/>
+        <source>Way</source>
+        <translation>Шлях</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1852"/>
-        <source>Add Map&Dust layer</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1122"/>
+        <source>Tools</source>
+        <translation>Інструменти</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1860"/>
-        <source>Wireframe</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1123"/>
+        <source>Windows</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1863"/>
-        <source>Ctrl+Alt+W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1124"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1868"/>
-        <source>Select parent(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1280"/>
+        <source>Cut Features</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1873"/>
-        <source>Download missing children</source>
-        <translation>Завантажити відсутніх нащадків</translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard invalid</source>
+        <translation>Хибні дані буферу обміну</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1768"/>
-        <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1412"/>
+        <source>Clipboard do not contain valid data.</source>
+        <translation>Буфер обміну не містить відповідних даних.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1771"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1580"/>
+        <source>Import file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1784"/>
-        <source>E&xtrude</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1606"/>
+        <location filename="../src/MainWindow.cpp" line="4381"/>
+        <source>Unsaved changes</source>
+        <translation>Не збережені зміни</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1787"/>
-        <source>Extrude interaction for ways (JOSM style)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1607"/>
+        <source>The current map contains unsaved changes that will be lost when starting a new one.
+Do you want to cancel starting a new map or continue and discard the old changes?</source>
+        <translation>Поточна мапа містить не збережені зміни, що будуть втрачені, якщо почати редагування нової мапи.
+Чи бажаєте скасувати створення нової мапи або продовжити та втратити усі зміни?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1790"/>
-        <source>Alt+X</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1614"/>
+        <source>Unsaved Style changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1795"/>
-        <source>Select toggle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1615"/>
+        <source>You have modified the current style.
+Do you want to save your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1800"/>
-        <source>Include children in selection</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1636"/>
+        <source>Waypoints</source>
+        <translation>Точки дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1812"/>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1652"/>
+        <source>Track %1</source>
+        <translation>Трек %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1817"/>
-        <source>Save as Template Document...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="1697"/>
+        <source>Big Fat Copyright Warning</source>
+        <translation>Велике жирне попередження про Авторські права</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1116"/>
-        <source>Paste</source>
-        <translation>Вставити</translation>
+        <location filename="../src/MainWindow.cpp" line="1698"/>
+        <source>You are trying to import a KML file. Please be aware that:
+
+ - You cannot import to OSM a KML file created from Google Earth. While you might
+   think that nodes you created from GE are yours, they are not!
+   They are still a derivative work from GE, and, as such, cannot be used in OSM.
+
+ - If you downloaded it from the Internet, chances are that there is a copyright on it.
+   Please be absolutely sure that using those data in OSM is permitted by the author, or
+   that the data is public domain.
+
+If unsure, please seek advice on the "legal" or "talk" openstreetmap mailing lists.
+
+Are you absolutely sure this KML can legally be imported in OSM?</source>
+        <translation>Ви намагаєтесь імпортувати KLM-файл. Зважте наступне:
+
+ - Ви не можете імпортувати KLM-файли створені у Google Earth. Ви вважаєте,
+   що точки створені з GE ваші, насправді це на так!
+   Вони все одно лишаються похідними від GE і тому, чорт забирай, не можуть
+   бути використані в OSM.
+
+ - Якщо ви завантажили їх з Інтернет, є шанс, що вони захищені авторським
+   правом. Будь ласка, переконайтесь, що у вас є дозвіл від автора на
+   їх використання в OSM або, що вони є суспільним надбанням.
+
+У разі невпевненості звертайтесь до оголошень у списках розсилки "legal" чи
+   "talk" від openstreetmap.
+
+Ви впевнені, що цей KLM-файл може буде імпортований до OSM на законних підставах?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1119"/>
-        <source>Paste features from the clipboard</source>
-        <translation>Вставити елементи з буферу обміну</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <source>No valid file</source>
+        <translation>Відповідні файли відсутні</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1122"/>
-        <source>Paste the features in the clipboard; If the features'id are already in the document, overwrite them.</source>
-        <translation>Вставити елемент з буферу обміну; якщо ідентифікатор елементу вже присутній у документі — переписати його.</translation>
+        <location filename="../src/MainWindow.cpp" line="1781"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>%1 could not be opened.</source>
+        <translation>%1 неможливо відкрити.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1125"/>
-        <source>Ctrl+V, F</source>
-        <translation>Ctrl+V, F</translation>
+        <location filename="../src/MainWindow.cpp" line="1915"/>
+        <source>Incoming Remote Control Request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1130"/>
-        <source>OSM (XML)</source>
-        <translation>OSM (XML)</translation>
+        <location filename="../src/MainWindow.cpp" line="1916"/>
+        <source>Wanted to load object '%1', but don't know how to do that. Sorry.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1135"/>
-        <source>OSM (Binary)</source>
-        <translation>OSM (двійковий)</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Incoming Remote control request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1140"/>
-        <source>&Force Upload</source>
-        <translation>&Швидке надсилання</translation>
+        <location filename="../src/MainWindow.cpp" line="1973"/>
+        <source>Unknown action url: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1143"/>
-        <source>Commit feature to the dirty layer</source>
-        <translation>Перенести елементи на шар-чернетку</translation>
+        <location filename="../src/MainWindow.cpp" line="1985"/>
+        <source>Open files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1146"/>
-        <location filename="../src/MainWindow.ui" line="1149"/>
-        <source>Commit the selected feature from a non-uploadable layer (e.g.Track or Extract) to the dirty layer, ready for upload</source>
-        <translation>Перенести виділені елементи з шару, що не надсилається (наприклад, Треки) до шару-чернетки, готового до надсилання</translation>
+        <location filename="../src/MainWindow.cpp" line="1997"/>
+        <source>Old Qt version detected</source>
+        <translation>Виявлено стару версію Qt</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1154"/>
-        <source>GPX</source>
-        <translation>GPX</translation>
+        <location filename="../src/MainWindow.cpp" line="1998"/>
+        <source>Your setup uses Qt %1, which contains various known errors in uploading data to OpenStreetMap leading to 401 server response codes. Are you sure you want to continue (which is not recommended).
+For more information see http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</source>
+        <translation>Ви використовуєте Qt версії %1, яка містить деякі відомі помилки надсилання даних до OpenStreetMap, починаючи з коду 401. Ви впевнені, що бажаєте продовжити (але ми не радимо вам це робити)?
+За докладною інформацією звертайтесь до http://wiki.openstreetmap.org/index.php/Problem_uploading_with_Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1159"/>
-        <source>KML</source>
-        <translation>KML</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>Upload OSM</source>
+        <translation>Надсилання даних OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1164"/>
-        <source>Toggle Toolbar</source>
-        <translation>Панель інструментів</translation>
+        <location filename="../src/MainWindow.cpp" line="2006"/>
+        <source>You don't seem to have specified your
+OpenStreetMap username and password.
+Do you want to do this now?</source>
+        <translation>Ви не зазначили в налаштуваннях ваш
+логін та пароль до OpenStreetMap.
+Бажаєте зробити це зараз?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1167"/>
-        <location filename="../src/MainWindow.ui" line="1170"/>
-        <source>Hide/Show the Toolbar</source>
-        <translation>Сховати/Показати панель Інструментів</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>Error downloading</source>
+        <translation>Помилка завантаження</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1175"/>
-        <source>Hide All</source>
-        <translation>Сховати все</translation>
+        <location filename="../src/MainWindow.cpp" line="2022"/>
+        <location filename="../src/MainWindow.cpp" line="2103"/>
+        <source>The map could not be downloaded</source>
+        <translation>Неможливо завантажити мапу</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1178"/>
-        <location filename="../src/MainWindow.ui" line="1186"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>Error downloading OpenStreetBugs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1183"/>
-        <source>Show All</source>
-        <translation>Показати все</translation>
+        <location filename="../src/MainWindow.cpp" line="2070"/>
+        <source>The OpenStreetBugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1194"/>
-        <source>&Image layer</source>
-        <translation>Шар &зображень</translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>Error downloading MapDust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1207"/>
-        <source>Show &nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2092"/>
+        <source>The MapDust bugs could not be downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1218"/>
-        <source>Show na&mes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Create Polygon</source>
+        <translation>Створити багатокутник</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1494"/>
-        <source>&WMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2431"/>
+        <source>Specify the number of sides</source>
+        <translation>Вкажіть кількість кутів</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1499"/>
-        <source>&TMS Servers Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2485"/>
+        <source>Join Roads</source>
+        <translation>Об’єднати дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1579"/>
-        <source>&Subdivide</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2499"/>
+        <source>Split Roads</source>
+        <translation>Розділити дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1582"/>
-        <source>Subdivide segment equally</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2513"/>
+        <source>Break Roads</source>
+        <translation>Відокремити дороги</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1585"/>
-        <source>Subdivide a selected way segment (the way and two adjacent nodes) into segments of equal length.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2527"/>
+        <source>Simplify Roads</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1647"/>
-        <source>S&implify</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2600"/>
+        <source>Force Feature upload</source>
+        <translation>Швидке надсилання елементів</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1650"/>
-        <source>Simplify road(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Network timeout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1653"/>
-        <source>Simplify way by removing unnecessary child nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2631"/>
+        <source>Cannot contact OpenStreetBugs.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1658"/>
-        <source>&Filters Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Error closing bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1666"/>
-        <source>&None</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2641"/>
+        <source>Cannot delete bug. Server message is:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1675"/>
-        <source>&Join Areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2648"/>
+        <source>Create Junction</source>
+        <translation>Створити перехрестя</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1678"/>
-        <source>Join touching areas</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2652"/>
+        <source>Multiple intersection.</source>
+        <translation>Багатократне перетинання.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1681"/>
-        <source>Join areas which are touching.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2653"/>
+        <source>Those roads have multiple intersections.
+Do you still want to create a junction for each one (Unwanted junctions can still be deleted afterhand)?</source>
+        <translation>Ці дороги мають багатократне перетинання.
+Ви все ще бажаєте створити перехрестя для кожного перетинання (небажані перехрестя після цього можна вилучити)?</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1690"/>
-        <source>&Split Area</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2670"/>
+        <source>Add Street Numbers</source>
+        <translation>Додати номер вулиці</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1693"/>
-        <source>Split area between two nodes</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <location filename="../src/MainWindow.cpp" line="2692"/>
+        <source>Number of segments to divide into</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1705"/>
-        <source>&Terrace</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2687"/>
+        <source>Specify the number of segments</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1708"/>
-        <source>Terrace area into residences</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2696"/>
+        <source>Subdivide road into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1711"/>
-        <source>Split a selected area into terraced residences.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2719"/>
+        <source>Axis Align</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1716"/>
-        <source>Toolbar Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2720"/>
+        <source>Specify the number of regular axes to align edges on (e.g. 4 for rectangular)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1199"/>
-        <source>&Raster/SVG</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2727"/>
+        <source>triangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="189"/>
-        <source>Ta&g templates</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2728"/>
+        <source>rectangular</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="347"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="2729"/>
+        <source>pentagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1210"/>
-        <source>Ctrl+Alt+P</source>
-        <translation>Ctrl+Alt+P</translation>
+        <location filename="../src/MainWindow.cpp" line="2730"/>
+        <source>hexagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1221"/>
-        <source>Ctrl+Alt+N</source>
-        <translation>Ctrl+Alt+N</translation>
+        <location filename="../src/MainWindow.cpp" line="2731"/>
+        <source>heptagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1226"/>
-        <source>&Start</source>
-        <translation>&Старт</translation>
+        <location filename="../src/MainWindow.cpp" line="2732"/>
+        <source>octagonal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1229"/>
-        <source>Start GPS</source>
-        <translation>Розпочати роботу з GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2736"/>
+        <source>Align onto %1 axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1234"/>
-        <source>&Replay...</source>
-        <translation>По&втор…</translation>
+        <location filename="../src/MainWindow.cpp" line="2738"/>
+        <source>Align onto %1 regular axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1237"/>
-        <source>Replay GPS</source>
-        <translation>Відтворити інформацію GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2745"/>
+        <location filename="../src/MainWindow.cpp" line="2748"/>
+        <source>Unable to align to axes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1245"/>
-        <source>&GPS</source>
-        <translation>&GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2746"/>
+        <source>Align to axes operation failed. Please adjust any sharp corners and try again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1248"/>
-        <location filename="../src/MainWindow.ui" line="1251"/>
-        <source>Hide/Show the GPS dock</source>
-        <translation>Сховати/Показати панель GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2749"/>
+        <source>Align to axes operation failed and did not converge on a solution.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1254"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
+        <location filename="../src/MainWindow.cpp" line="2765"/>
+        <source>Bing Extract</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1262"/>
-        <source>S&top</source>
-        <translation>С&топ</translation>
+        <location filename="../src/MainWindow.cpp" line="2780"/>
+        <source>Align Nodes</source>
+        <translation>Вирівняти точки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1265"/>
-        <source>Stop GPS</source>
-        <translation>Зупинити роботу із GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2794"/>
+        <source>Spread Nodes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1273"/>
-        <source>&Center on GPS</source>
-        <translation>&Центрувати за GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="2823"/>
+        <source>Detach Node %1</source>
+        <translation>Від’єднати точку %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1281"/>
-        <source>Show track &segments</source>
-        <translation>Показати &сегменти треку</translation>
+        <location filename="../src/MainWindow.cpp" line="2837"/>
+        <source>Add member to relation</source>
+        <translation>Додати елемент до відношення</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1284"/>
-        <source>Ctrl+Alt+T</source>
-        <translation>Ctrl+Alt+T</translation>
+        <location filename="../src/MainWindow.cpp" line="2849"/>
+        <source>Remove member from relation</source>
+        <translation>Вилучити елемент з відношення</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1292"/>
-        <source>Show &scale</source>
-        <translation>Показати &масштаб</translation>
+        <location filename="../src/MainWindow.cpp" line="2861"/>
+        <source>Add to Multipolygon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1295"/>
-        <source>Ctrl+Alt+S</source>
-        <translation>Ctrl+Alt+S</translation>
+        <location filename="../src/MainWindow.cpp" line="2873"/>
+        <source>Join areas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1303"/>
-        <source>Show &relations</source>
-        <translation>Показати &відношення</translation>
+        <location filename="../src/MainWindow.cpp" line="2885"/>
+        <source>Split area</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1306"/>
-        <source>Ctrl+Alt+R</source>
-        <translation>Ctrl+Alt+R</translation>
+        <location filename="../src/MainWindow.cpp" line="2900"/>
+        <source>Terrace area into %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1314"/>
-        <source>Show roads background</source>
-        <translation>Показати фон доріг</translation>
+        <location filename="../src/MainWindow.cpp" line="2928"/>
+        <source>Create Relation %1</source>
+        <translation>Створити Відношення %1</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1322"/>
-        <source>Show roads boundary</source>
-        <translation>Показати межі доріг</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Save map style</source>
+        <translation>Зберегти стиль мапи</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1330"/>
-        <source>Show touchup</source>
-        <translation>Показати підказки</translation>
+        <location filename="../src/MainWindow.cpp" line="3002"/>
+        <source>Merkaartor map style (*.mas)</source>
+        <translation>Стиль мапи Merkaartor (*.mas)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1341"/>
-        <location filename="../src/MainWindow.ui" line="1344"/>
-        <source>Record</source>
-        <translation>Запис</translation>
+        <location filename="../src/MainWindow.cpp" line="3023"/>
+        <source>Load map style</source>
+        <translation>Завантажити стиль мапи</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1347"/>
-        <source>Record GPS</source>
-        <translation>Записати інформацію з GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3025"/>
+        <source>Merkaartor map style (*.mas)
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1358"/>
-        <source>Pause</source>
-        <translation>Пауза</translation>
+        <location filename="../src/MainWindow.cpp" line="3026"/>
+        <source>MapCSS stylesheet (*.css)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1361"/>
-        <source>Pause GPS</source>
-        <translation>Призупинити запис інформації з GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>Rebuild History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/MainWindow.cpp" line="3085"/>
+        <source>An attempt will be made to rebuild the history.
+No guarantee, though, and no Undo.
+Are you sure you want to try this? </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1369"/>
-        <source>G&eoImage</source>
-        <translation>G&eoImage</translation>
+        <location filename="../src/MainWindow.cpp" line="3190"/>
+        <location filename="../src/MainWindow.cpp" line="3385"/>
+        <source>untitled</source>
+        <translation>без назви</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1372"/>
-        <location filename="../src/MainWindow.ui" line="1375"/>
-        <source>Hide/Show the GeoImage dock</source>
-        <translation>Сховати/Показати панель GeoImage</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <source>Save Merkaartor document</source>
+        <translation>Зберегти документ Merkaartor</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1378"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+        <location filename="../src/MainWindow.cpp" line="3206"/>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Merkaartor documents Files (*.mdc)</source>
+        <translation>Файли документів Merkaartor (*.mdc)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1383"/>
-        <source>World OSB manager...</source>
-        <translation>Менеджер OSB World…</translation>
+        <location filename="../src/MainWindow.cpp" line="3216"/>
+        <source>Save Merkaartor template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1391"/>
-        <source>&Shortcut Editor...</source>
-        <translation>&Комбінації клавіш…</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <source>Unable to open save file</source>
+        <translation>Неможливо відкрити збережений файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1401"/>
-        <source>&Merge...</source>
-        <translation>З’&єднати…</translation>
+        <location filename="../src/MainWindow.cpp" line="3261"/>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>%1 could not be opened for writing.</source>
+        <translation>%1 неможливо відкрити для запису.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1411"/>
-        <source>&Add member</source>
-        <translation>&Додати елемент</translation>
+        <location filename="../src/MainWindow.cpp" line="3277"/>
+        <source>Unable to open save template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1416"/>
-        <source>&Remove member</source>
-        <translation>&Вилучити елемент</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <location filename="../src/MainWindow.cpp" line="3339"/>
+        <source>Invalid file</source>
+        <translation>Хибний файл</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1424"/>
-        <source>&Never</source>
-        <translation>&ніколи</translation>
+        <location filename="../src/MainWindow.cpp" line="3294"/>
+        <source>%1 is not a valid Merkaartor document.</source>
+        <translation>%1 — не є вірним документом Merkaartor’а.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1432"/>
-        <source>for &Oneway roads</source>
-        <translation>для &односторонніх доріг</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>Export OSM</source>
+        <translation>Експорт даних OSM</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1440"/>
-        <source>&Always</source>
-        <translation>&завжди</translation>
+        <location filename="../src/MainWindow.cpp" line="3398"/>
+        <source>OSM Files (*.osm)</source>
+        <translation>Файли OSM (*.osm)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1449"/>
-        <source>&Detach</source>
-        <translation>&Від’єднати</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>Export osmChange</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1452"/>
-        <source>Detach node from a road</source>
-        <translation>Від’єднати точку від дороги</translation>
+        <location filename="../src/MainWindow.cpp" line="3413"/>
+        <source>osmChange Files (*.osc)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1455"/>
-        <source>Detach a node from a Road</source>
-        <translation>Від’єднати точку від дороги</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>Export GPX</source>
+        <translation>Експорт GPX</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1467"/>
-        <source>&Work Offline</source>
-        <translation>&Працювати оффлайн</translation>
+        <location filename="../src/MainWindow.cpp" line="3434"/>
+        <source>GPX Files (*.gpx)</source>
+        <translation>Файли GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1472"/>
-        <source>SVG</source>
-        <translation>Векторний малюнок (SVG)</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>Export KML</source>
+        <translation>Експорт KML</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1480"/>
-        <source>&Styles</source>
-        <translation>&Стилі</translation>
+        <location filename="../src/MainWindow.cpp" line="3469"/>
+        <source>KML Files (*.kml)</source>
+        <translation>Файли KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1483"/>
-        <location filename="../src/MainWindow.ui" line="1486"/>
-        <source>Hide/Show the Styles dock</source>
-        <translation>Сховати/Показати панель Стилів</translation>
+        <location filename="../src/MainWindow.cpp" line="3561"/>
+        <source>Feature extraction</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1489"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+        <location filename="../src/MainWindow.cpp" line="3571"/>
+        <source>Extracting features...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1504"/>
-        <source>&Reset Discardable dialogs status</source>
-        <translation>&Перевстановити стан діалогу Discardable</translation>
+        <location filename="../src/MainWindow.cpp" line="3654"/>
+        <source>Hide tool buttons labels</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1513"/>
-        <source>GPS Menu</source>
-        <translation>Меню GPS</translation>
+        <location filename="../src/MainWindow.cpp" line="3765"/>
+        <source>%1 (int)</source>
+        <translation>%1 (int)</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1522"/>
-        <source>Camera</source>
-        <translation>Камера</translation>
+        <location filename="../src/MainWindow.cpp" line="3817"/>
+        <source>Add Bookmark</source>
+        <translation>Додати закладку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1527"/>
-        <source>Create &Junction</source>
-        <translation>Створити &перехрестя</translation>
+        <location filename="../src/MainWindow.cpp" line="3818"/>
+        <source>Specify the name of the bookmark.</source>
+        <translation>Вкажіть ім’я закладки.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1539"/>
-        <source>Rotate</source>
-        <translation>Обертання</translation>
+        <location filename="../src/MainWindow.cpp" line="3821"/>
+        <source>Invalid bookmark name</source>
+        <translation>Помилкове ім’я закладки</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1542"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+        <location filename="../src/MainWindow.cpp" line="3822"/>
+        <source>Bookmark cannot be blank.</source>
+        <translation>Закладка не може бути порожньою.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1113"/>
-        <source>Paste Feature(s)</source>
-        <translation>Вставити елемент(и)</translation>
+        <location filename="../src/MainWindow.cpp" line="3826"/>
+        <source>Warning: Bookmark name already exists</source>
+        <translation>Попередження: закладка з таким ім’ям вже існує</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1565"/>
-        <source>Features</source>
-        <translation>Елементи</translation>
+        <location filename="../src/MainWindow.cpp" line="3827"/>
+        <source>Enter a new one, keep the same to overwrite or cancel.</source>
+        <translation>Введіть нове значення, лишить теж саме, щоб перезаписати або натисніть скасувати.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1570"/>
-        <source>Add street &numbers (Karlsruhe scheme)</source>
-        <translation>&Додати номер вулиці (схема Карлсрує)</translation>
+        <location filename="../src/MainWindow.cpp" line="3865"/>
+        <source>Remove Bookmark</source>
+        <translation>Вилучити закладку</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1593"/>
-        <source>Show &virtual nodes</source>
-        <translation>Показувати в&ірутальні точки</translation>
+        <location filename="../src/MainWindow.cpp" line="3866"/>
+        <source>Select the bookmark to remove.</source>
+        <translation>Оберіть закладку для вилучення.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1601"/>
-        <source>Show lat/lon &grid</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Invalid projection</source>
+        <translation>Помилкова проекція</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1609"/>
-        <source>&Lock zoom to tiled background</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="3926"/>
+        <location filename="../src/MainWindow.cpp" line="3935"/>
+        <source>Unable to set projection "%1".</source>
+        <translation>Неможливо встановити проекцію. "%1".</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1614"/>
-        <source>&Projections Editor...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4067"/>
+        <source>GPS error</source>
+        <translation>помилка GPS</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1622"/>
-        <source>Show &Photos on map</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4068"/>
+        <source>Unable to open GPS port.</source>
+        <translation>Неможливо відкрити порт GPS.</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1627"/>
-        <source>OsmChange (OSC)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4077"/>
+        <source>Open NMEA log file</source>
+        <translation>Відкрити файл журналу NMEA</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1632"/>
-        <source>Force Delete</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Save Tag Templates</source>
+        <translation>Зберегти шаблони теґів</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.ui" line="1642"/>
-        <source>Close</source>
-        <translation>Закрити</translation>
+        <location filename="../src/MainWindow.cpp" line="4193"/>
+        <source>Merkaartor tag templates (*.mat)</source>
+        <translation>Шаблони теґів Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="794"/>
-        <source>Relation Modified %1</source>
-        <translation>Відношення %1 змінено</translation>
+        <location filename="../src/MainWindow.cpp" line="4202"/>
+        <location filename="../src/MainWindow.cpp" line="4216"/>
+        <source>Open Tag Templates</source>
+        <translation>Відкрити шаблони теґів</translation>
     </message>
     <message>
-        <location filename="../src/Interactions/EditInteraction.cpp" line="301"/>
-        <source>Delete Children.</source>
-        <translation>Вилучити нащадків.</translation>
+        <location filename="../src/MainWindow.cpp" line="4303"/>
+        <source>Warning! Could not load the Merkaartor translations for the "%1" language. Switching to default English.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Unresolved conflicts</source>
         <translation>Нерозв’язувані конфлікти</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4443"/>
+        <location filename="../src/MainWindow.cpp" line="4361"/>
         <source>Please resolve existing conflicts first</source>
         <translation>Будь ласка, розв’яжіть поточні конфлікти</translation>
     </message>
     <message>
-        <location filename="../src/MainWindow.cpp" line="4467"/>
+        <location filename="../src/MainWindow.cpp" line="4382"/>
         <source>It is strongly recommended to save the changes to your document after an upload.
 Do you want to do this now?</source>
         <translation>Ми радимо зберегти зміни у вашому документі після його відправи.
@@ -4532,217 +4586,181 @@ Do you want to do this now?</source>
         <source>Set Tags on %1</source>
         <translation>Встановити теґ для %1</translation>
     </message>
+</context>
+<context>
+    <name>MapFeature</name>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="720"/>
-        <source>Clear %1 tags on %2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1057"/>
+        <source><i>V: </i><b>%1</b> </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="853"/>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="898"/>
-        <source>Reorder members in relation %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1059"/>
+        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
+        <translation><i>ост.: </i><b>%1</b> от <b>%2</b></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ExtrudeInteraction.cpp" line="124"/>
-        <source>Extrude Road %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1061"/>
+        <source><i>last: </i><b>%1</b></source>
+        <translation><i>ост.: </i><b>%1</b></translation>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="39"/>
-        <source>HOVER to select;LEFT-DRAG to scale</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1064"/>
+        <source><br/><i>layer: </i><b>%1</b> </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="44"/>
-        <source>Scale Interaction</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Feature.cpp" line="1088"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Interactions/ScaleInteraction.cpp" line="139"/>
-        <source>Scale Feature</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="375"/>
+        <location filename="../src/Features/Node.cpp" line="638"/>
+        <source>Waypoint</source>
+        <translation>Точки дороги</translation>
     </message>
     <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="753"/>
-        <source>Set "source" tag on %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="376"/>
+        <location filename="../src/Features/Node.cpp" line="639"/>
+        <source>coord</source>
+        <translation>коорд</translation>
     </message>
-</context>
-<context>
-    <name>MapFeature</name>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1072"/>
-        <source><i>V: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="379"/>
+        <location filename="../src/Features/Node.cpp" line="646"/>
+        <source>description</source>
+        <translation>опис</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1074"/>
-        <source><i>last: </i><b>%1</b> by <b>%2</b></source>
-        <translation><i>ост.: </i><b>%1</b> от <b>%2</b></translation>
+        <location filename="../src/Features/Node.cpp" line="381"/>
+        <location filename="../src/Features/Node.cpp" line="648"/>
+        <source>comment</source>
+        <translation>коментар</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1076"/>
-        <source><i>last: </i><b>%1</b></source>
-        <translation><i>ост.: </i><b>%1</b></translation>
+        <location filename="../src/Features/Node.cpp" line="383"/>
+        <location filename="../src/Features/Node.cpp" line="650"/>
+        <source>Node</source>
+        <translation>Точка</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1079"/>
-        <source><br/><i>layer: </i><b>%1</b> </source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="642"/>
+        <source>elevation</source>
+        <translation>висота</translation>
     </message>
     <message>
-        <location filename="../src/Features/Feature.cpp" line="1103"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Features/Node.cpp" line="644"/>
+        <source>speed</source>
+        <translation>швидкість</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>size</source>
         <translation>розмір</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="704"/>
+        <location filename="../src/Features/Relation.cpp" line="705"/>
         <source>members</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="707"/>
-        <location filename="../src/Features/Way.cpp" line="916"/>
+        <location filename="../src/Features/Relation.cpp" line="708"/>
+        <location filename="../src/Features/Way.cpp" line="911"/>
         <source>Topleft</source>
         <translation>Верхній лівий кут</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="709"/>
-        <location filename="../src/Features/Way.cpp" line="918"/>
+        <location filename="../src/Features/Relation.cpp" line="710"/>
+        <location filename="../src/Features/Way.cpp" line="913"/>
         <source>Botright</source>
         <translation>Правий нижній кут</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="711"/>
+        <location filename="../src/Features/Relation.cpp" line="712"/>
         <source>Relation</source>
         <translation>Відношення</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="773"/>
+        <location filename="../src/Features/Relation.cpp" line="774"/>
         <source>Role</source>
         <translation>Роль</translation>
     </message>
     <message>
-        <location filename="../src/Features/Relation.cpp" line="775"/>
+        <location filename="../src/Features/Relation.cpp" line="776"/>
         <source>Member</source>
         <translation>Член</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="908"/>
+        <location filename="../src/Features/Way.cpp" line="903"/>
         <source>Closed way</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="911"/>
+        <location filename="../src/Features/Way.cpp" line="906"/>
         <source>Length</source>
         <translation>Довжина</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>Size</source>
         <translation>Розмір</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="913"/>
+        <location filename="../src/Features/Way.cpp" line="908"/>
         <source>%1 nodes</source>
         <translation>точок - %1</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Area</source>
         <translation>Ділянка</translation>
     </message>
     <message>
-        <location filename="../src/Features/Way.cpp" line="920"/>
+        <location filename="../src/Features/Way.cpp" line="915"/>
         <source>Way</source>
         <translation>Шлях</translation>
     </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="372"/>
-        <location filename="../src/Features/Node.cpp" line="635"/>
-        <source>coord</source>
-        <translation>коорд</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="638"/>
-        <source>elevation</source>
-        <translation>висота</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="640"/>
-        <source>speed</source>
-        <translation>швидкість</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="375"/>
-        <location filename="../src/Features/Node.cpp" line="642"/>
-        <source>description</source>
-        <translation>опис</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="377"/>
-        <location filename="../src/Features/Node.cpp" line="644"/>
-        <source>comment</source>
-        <translation>коментар</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="371"/>
-        <location filename="../src/Features/Node.cpp" line="634"/>
-        <source>Waypoint</source>
-        <translation>Точки дороги</translation>
-    </message>
-    <message>
-        <location filename="../src/Features/Node.cpp" line="379"/>
-        <location filename="../src/Features/Node.cpp" line="646"/>
-        <source>Node</source>
-        <translation>Точка</translation>
-    </message>
 </context>
 <context>
     <name>MapView</name>
     <message>
-        <location filename="../src/common/MapView.cpp" line="384"/>
-        <source>%1 m</source>
-        <translation>%1 м</translation>
-    </message>
-    <message>
-        <location filename="../src/common/MapView.cpp" line="386"/>
-        <source>%1 km</source>
-        <translation>%1 км</translation>
-    </message>
-    <message>
         <location filename="../src/common/MapView.cpp" line="339"/>
         <source>%1 m/pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/MapView.cpp" line="345"/>
         <source>Align: %1m @ %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="351"/>
+        <source>%1ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/common/MapView.cpp" line="384"/>
+        <source>%1 m</source>
+        <translation>%1 м</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="351"/>
-        <source>%1ms</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/common/MapView.cpp" line="386"/>
+        <source>%1 km</source>
+        <translation>%1 км</translation>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1147"/>
+        <location filename="../src/common/MapView.cpp" line="1146"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1148"/>
+        <location filename="../src/common/MapView.cpp" line="1147"/>
         <source>Bounding Box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/MapView.cpp" line="1160"/>
+        <location filename="../src/common/MapView.cpp" line="1159"/>
         <source>Projection</source>
         <translation>Проекція</translation>
     </message>
@@ -4756,22 +4774,32 @@ Do you want to do this now?</source>
         <translation>Нова Закладка</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>Preferences upload failed</source>
         <translation>Невдача завантаження параметрів</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="515"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="404"/>
         <source>Duplicate key</source>
         <translation>Дублювати ключ</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="518"/>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="407"/>
         <source>More than 150 preferences</source>
         <translation>Більше ніж 150 параметрів</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Preferences communication failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/MerkaartorPreferences.cpp" line="410"/>
+        <source>Communication error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TmsServersList.cpp" line="20"/>
         <location filename="../src/Preferences/TmsServersList.cpp" line="38"/>
         <location filename="../src/Preferences/WmsServersList.cpp" line="20"/>
@@ -4806,17 +4834,17 @@ Do you want to do this now?</source>
 <context>
     <name>NameFinder::NameFinderTableModel</name>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="68"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="69"/>
         <source>Class</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="71"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="72"/>
         <source>Name</source>
         <translation>Назва</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="74"/>
+        <location filename="../src/NameFinder/namefindertablemodel.cpp" line="75"/>
         <source>Unknown field</source>
         <translation>Невідоме поле</translation>
     </message>
@@ -4829,25 +4857,10 @@ Do you want to do this now?</source>
         <translation>Помилка!</translation>
     </message>
     <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="95"/>
-        <source>Name finder service host not found.</source>
-        <translation>Сервер сервісу пошуку назв не знайдено.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="98"/>
-        <source>Name finder service host refused connection.</source>
-        <translation>Сервер сервісу пошуку назв відмовив у з’єднанні.</translation>
-    </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="101"/>
+        <location filename="../src/NameFinder/namefinderwidget.cpp" line="93"/>
         <source>Name finder service requires authentication.</source>
         <translation>Сервер сервісу пошуку назв потребує автентифікації.</translation>
     </message>
-    <message>
-        <location filename="../src/NameFinder/namefinderwidget.cpp" line="103"/>
-        <source>Unknown error.</source>
-        <translation>Невідома помилка.</translation>
-    </message>
 </context>
 <context>
     <name>NameFinderWidgetUi</name>
@@ -4868,11 +4881,6 @@ Do you want to do this now?</source>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
-        <source>PDF files (*.pdf)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>untitled</source>
@@ -4880,6 +4888,11 @@ Do you want to do this now?</source>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
+        <source>PDF files (*.pdf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Render/NativeRenderDialog.cpp" line="161"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="194"/>
         <location filename="../src/Render/NativeRenderDialog.cpp" line="231"/>
         <source>All Files (*)</source>
@@ -4901,12 +4914,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="14"/>
         <source>Raster/SVG export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="26"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="49"/>
@@ -4921,12 +4934,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="174"/>
         <source>Show Nodes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="181"/>
         <source>Show Relations</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="191"/>
@@ -4936,27 +4949,27 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="204"/>
         <source>Show Lat/Lon Grid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="214"/>
         <source>Show unstyled features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="232"/>
         <source>Export to PDF...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="239"/>
         <source>Export to SVG...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Render/NativeRenderDialog.ui" line="246"/>
         <source>Export to Raster...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4969,7 +4982,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="25"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="35"/>
@@ -4985,31 +4998,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/Preferences/OsmServerWidget.ui" line="84"/>
         <source>Pwd:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PaintStyleEditor</name>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
-        <source>Always</source>
-        <translation>Завжди</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
-        <source>Select Color</source>
-        <translation>Виберіть колір</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="14"/>
         <source>Map style editor</source>
         <translation>Редактор стилів мапи</translation>
@@ -5042,9 +5036,34 @@ Do you want to do this now?</source>
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
+        <source>Nodes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
+        <source>Proportional thickness</source>
+        <translation>Пропорційна товщина</translation>
+    </message>
+    <message>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
+        <source>Fixed thickness</source>
+        <translation>Фіксована товщина</translation>
+    </message>
+    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="206"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="230"/>
@@ -5090,31 +5109,6 @@ Do you want to do this now?</source>
         <translation>Креслити кольором</translation>
     </message>
     <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="142"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="532"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="837"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1043"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1216"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1457"/>
-        <source>Proportional thickness</source>
-        <translation>Пропорційна товщина</translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="80"/>
-        <source>Nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="162"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="552"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="857"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1063"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1236"/>
-        <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1477"/>
-        <source>Fixed thickness</source>
-        <translation>Фіксована товщина</translation>
-    </message>
-    <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="614"/>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1125"/>
         <source>Dashed</source>
@@ -5134,7 +5128,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="730"/>
         <source>Fill with Touchup icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="761"/>
@@ -5144,12 +5138,12 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="913"/>
         <source>Interior</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="923"/>
         <source>Exteriror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="967"/>
@@ -5169,7 +5163,7 @@ Do you want to do this now?</source>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1273"/>
         <source>Draw Traffic Direction Marks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/PaintStyle/PaintStyleEditor.ui" line="1333"/>
@@ -5206,253 +5200,112 @@ Do you want to do this now?</source>
         <source>Label with background tag</source>
         <translation>Мітка з позначкою фону</translation>
     </message>
-</context>
-<context>
-    <name>PhotoLoadErrorDialog</name>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
-        <source>No Valid geotag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
-        <source>This photo does not contain geo-tagging EXIF data.
-What do you want to do next?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
-        <source>Try to match with a track node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
-        <source>Load without associated node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
-        <source>Extract info from barcode (Walking Papers)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
-        <source>Ignore it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
-        <source>Do this for all current photos.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PictureViewerDialog</name>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Output filename</source>
-        <translation>Ім’я вихідного файлу</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <source>SVG files (*.svg)</source>
-        <translation>Файли SVG (*.svg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>untitled</source>
-        <translation>без назви</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>All Files (*)</source>
-        <translation>Всі файли (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
-        <source>Image files (*.png *.jpg)</source>
-        <translation>Файли зображень (*.png *.jpg)</translation>
-    </message>
-    <message>
-        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Надсилання змін</translation>
-    </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
-        <source>English</source>
-        <translation>English — Англійська</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
-        <source>Arabic</source>
-        <translation>Arabic — Арабська</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
-        <source>Croatian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
-        <source>Czech</source>
-        <translation>Czech — Чеська</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
-        <source>German</source>
-        <translation>German — Німецька</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
-        <source>French</source>
-        <translation>French — Французька</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
-        <source>Hungarian</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
-        <source>Italian</source>
-        <translation>Italian — Італійська</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
-        <source>Japanese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
-        <source>Polish</source>
-        <translation>Polish — Польська</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
-        <source>Brazilian Portuguese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
-        <source>Russian</source>
-        <translation>Russian — Російська</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
-        <source>Custom styles directory</source>
-        <translation>Тека власних стилів</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Tag Template</source>
-        <translation>Шаблон теґів</translation>
-    </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
-        <source>Merkaartor tag template (*.mat)</source>
-        <translation>Шаблон теґів Merkaartor (*.mat)</translation>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="50"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="51"/>
+        <source>Always</source>
+        <translation>Завжди</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="521"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="534"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="547"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="560"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="573"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="586"/>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="598"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="313"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="331"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="372"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="455"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="543"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="574"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="650"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="756"/>
+        <location filename="../src/PaintStyle/PaintStyleEditor.cpp" line="803"/>
         <source>Select Color</source>
         <translation>Виберіть колір</translation>
     </message>
+</context>
+<context>
+    <name>PhotoLoadErrorDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
-        <source>Tool already exists</source>
-        <translation>Інструмент вже існує</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="14"/>
+        <source>No Valid geotag</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
-        <source>A tool of this name already exists.
-Please select another name or click the <Apply> button if you want to modify the existing one</source>
-        <translation>Інструмент з таким іменем вже Існує.
-Оберіть інше ім’я, або натисніть <Apply>, якщо бажаєте змінити існуючий</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="20"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
-        <source>Cannot delete preset tool</source>
-        <translation>Неможливо вилучити предналаштований інструмент</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="27"/>
+        <source>This photo does not contain geo-tagging EXIF data.
+What do you want to do next?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="634"/>
-        <source>Cannot delete preset tool "%1"</source>
-        <translation>Неможливо вилучити предналаштований інструмент "%1"</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="44"/>
+        <source>Try to match with a track node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="652"/>
-        <source>Cannot modify preset tool name</source>
-        <translation>Неможливо змінити предналаштований інструмент</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="63"/>
+        <source>Load without associated node</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="653"/>
-        <source>Cannot modify preset tool "%1"'s name</source>
-        <translation>Неможливо змінити предналаштований інструмент "%1"</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="73"/>
+        <source>Extract info from barcode (Walking Papers)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="678"/>
-        <source>Select tool executable</source>
-        <translation>Вкажіть виконавчий файл інструмента</translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="89"/>
+        <source>Ignore it</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Select template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Docks/PhotoLoadErrorDialog.ui" line="99"/>
+        <source>Do this for all current photos.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PictureViewerDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="686"/>
-        <source>Merkaartor document (*.mdc)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Utils/PictureViewerDialog.ui" line="13"/>
+        <source>Dialog</source>
+        <translation>Надсилання змін</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.cpp" line="694"/>
-        <source>Select Log directory</source>
-        <translation>Вкажіть теку для журналів</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Output filename</source>
+        <translation>Ім’я вихідного файлу</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
-        <source>Preferences</source>
-        <translation>Параметри</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>untitled</source>
+        <translation>без назви</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
-        <source>Locale</source>
-        <translation>Мова</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <source>SVG files (*.svg)</source>
+        <translation>Файли SVG (*.svg)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
-        <source>You may need to restart the program for these changes to take effect</source>
-        <translation>Потрібно перезапустити програму, щоб зміни набули сили</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="40"/>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>All Files (*)</source>
+        <translation>Всі файли (*)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
-        <source>Use language</source>
-        <translation>Використовувати мову</translation>
+        <location filename="../src/Utils/PictureViewerDialog.cpp" line="56"/>
+        <source>Image files (*.png *.jpg)</source>
+        <translation>Файли зображень (*.png *.jpg)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
-        <source>Translate standard tags</source>
-        <translation>Перекладати стандартні теґи</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="15"/>
+        <source>Preferences</source>
+        <translation>Параметри</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="28"/>
@@ -5475,11 +5328,6 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Непрозорість мін/макс</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
-        <source>Separate Move mode</source>
-        <translation>Окремий режим для переміщення</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="97"/>
         <source>Single mouse button interaction</source>
         <translation>Миша з однією кнопкою</translation>
@@ -5490,11 +5338,26 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Власний стиль Qt</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
+        <source>Allow node/way creation in select mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="118"/>
+        <source>Separate Move mode</source>
+        <translation>Окремий режим для переміщення</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="125"/>
         <source>Use Virtual nodes (new session required)</source>
         <translation>Використовувати віртуальні точки (потрібно створити новий сеанс)</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
+        <source>Relations selectable while hidden</source>
+        <translation>Зв’язки можна виділяти, коли вони приховані</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="165"/>
         <source>Colors</source>
         <translation>Кольори</translation>
@@ -5526,9 +5389,9 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Замінити стиль</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
-        <source>Hover</source>
-        <translation>Під вказівником</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
+        <source>GPX track</source>
+        <translation>Треки GPX</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="252"/>
@@ -5541,160 +5404,187 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Пікселів</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
-        <source>Highlight</source>
-        <translation>Підсвічування</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
-        <source>Focus</source>
-        <translation>Обране</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
-        <source>Relations</source>
-        <translation>Відношення</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="221"/>
-        <source>GPX track</source>
-        <translation>Треки GPX</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="259"/>
         <source>Use simple GPX track appearance</source>
         <translation>Простий вигляд треків GPX</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
-        <source>Map style</source>
-        <translation>Стиль мапи</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
-        <source>Current style</source>
-        <translation>Поточний стиль</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
-        <source>Disable styles for track layers</source>
-        <translation>Не використовувати стилі для шарів з треками</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
+        <source>Interface</source>
+        <translation>Інтерфейс</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
-        <source>Template</source>
-        <translation>Шаблони</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="431"/>
+        <source>Hover</source>
+        <translation>Під вказівником</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
-        <source>Built-in</source>
-        <translation>Вбудований</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="484"/>
+        <source>Relations</source>
+        <translation>Відношення</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
-        <source>Custom</source>
-        <translation>Власний</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="491"/>
+        <source>Focus</source>
+        <translation>Обране</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
-        <source>Data</source>
-        <translation>Дані</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="498"/>
+        <source>Highlight</source>
+        <translation>Підсвічування</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
-        <source>Autoload template document</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
+        <source>Dirty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="575"/>
+        <source>Locale</source>
+        <translation>Мова</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
-        <source>Documents</source>
-        <translation>Документи</translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="581"/>
+        <source>You may need to restart the program for these changes to take effect</source>
+        <translation>Потрібно перезапустити програму, щоб зміни набули сили</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="111"/>
-        <source>Allow node/way creation in select mode</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="590"/>
+        <source>Use language</source>
+        <translation>Використовувати мову</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="551"/>
-        <source>Dirty</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="625"/>
+        <source>Translate standard tags</source>
+        <translation>Перекладати стандартні теґи</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="646"/>
         <source>Rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="652"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="658"/>
         <source>Use Anti-aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="665"/>
         <source>Disable Anti-alisaing while panning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="672"/>
         <source><html><head/><body><p>If enabled, wireframe rendering (View-Wireframe) will use the current style for colors and fill. Only the fixed thickness will be used for width. </p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="675"/>
         <source>Use current style for wireframe rendering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="685"/>
         <source>Editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="691"/>
         <source>Quick editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="698"/>
         <source>Wireframe editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="705"/>
         <source>Full render editing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="715"/>
+        <source>Map style</source>
+        <translation>Стиль мапи</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="723"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="503"/>
+        <source>Custom styles directory</source>
+        <translation>Тека власних стилів</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="757"/>
+        <source>Current style</source>
+        <translation>Поточний стиль</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="779"/>
+        <source>Disable styles for track layers</source>
+        <translation>Не використовувати стилі для шарів з треками</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="803"/>
+        <source>Template</source>
+        <translation>Шаблони</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="809"/>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Tag Template</source>
+        <translation>Шаблон теґів</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="817"/>
+        <source>Built-in</source>
+        <translation>Вбудований</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="841"/>
+        <source>Custom</source>
+        <translation>Власний</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="890"/>
+        <source>Data</source>
+        <translation>Дані</translation>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="902"/>
         <source>OSM API (URL is, e.g., "http://www.openstreetmap.org/api/0.6"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="916"/>
         <source>XAPI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="924"/>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="956"/>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="945"/>
         <source>Nominatim (Geo Search)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="968"/>
+        <source>Documents</source>
+        <translation>Документи</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="979"/>
+        <source>Autoload template document</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1004"/>
@@ -5724,12 +5614,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1059"/>
         <source>GDAL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1065"/>
         <source>Confirm projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1089"/>
@@ -5739,12 +5629,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1095"/>
         <source>GPS input</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1101"/>
         <source>gpsd</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1108"/>
@@ -5788,6 +5678,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Використовувати проксі</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.ui" line="1277"/>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1300"/>
         <source>User:</source>
         <translation>Логін:</translation>
@@ -5805,12 +5700,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1365"/>
         <source>Network Timeout (sec)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1403"/>
         <source>Enable JOSM-compatible local server on port 8111</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1424"/>
@@ -5840,7 +5735,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1471"/>
         <source>Automatically add "source" tag when creating features over a background map</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/PreferencesDialog.ui" line="1500"/>
@@ -5873,16 +5768,76 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Вилучити</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="162"/>
+        <source>English</source>
+        <translation>English — Англійська</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="163"/>
+        <source>Arabic</source>
+        <translation>Arabic — Арабська</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="164"/>
+        <source>Croatian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="165"/>
+        <source>Czech</source>
+        <translation>Czech — Чеська</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="166"/>
         <source>Dutch</source>
         <translation>Голландська</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="167"/>
+        <source>German</source>
+        <translation>German — Німецька</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="168"/>
+        <source>French</source>
+        <translation>French — Французька</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="169"/>
+        <source>Hungarian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="170"/>
+        <source>Italian</source>
+        <translation>Italian — Італійська</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="171"/>
+        <source>Japanese</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="172"/>
+        <source>Polish</source>
+        <translation>Polish — Польська</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="173"/>
         <source>Portuguese</source>
         <translation>Португальська</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="174"/>
+        <source>Brazilian Portuguese</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="175"/>
+        <source>Russian</source>
+        <translation>Russian — Російська</translation>
+    </message>
+    <message>
         <location filename="../src/Preferences/PreferencesDialog.cpp" line="176"/>
         <source>Slovak</source>
         <translation>Словацька</translation>
@@ -5903,14 +5858,66 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Українська</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="132"/>
-        <source>Relations selectable while hidden</source>
-        <translation>Зв’язки можна виділяти, коли вони приховані</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="512"/>
+        <source>Merkaartor tag template (*.mat)</source>
+        <translation>Шаблон теґів Merkaartor (*.mat)</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/PreferencesDialog.ui" line="287"/>
-        <source>Interface</source>
-        <translation>Інтерфейс</translation>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="520"/>
+        <source>Select Color</source>
+        <translation>Виберіть колір</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="593"/>
+        <source>Tool already exists</source>
+        <translation>Інструмент вже існує</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="594"/>
+        <source>A tool of this name already exists.
+Please select another name or click the <Apply> button if you want to modify the existing one</source>
+        <translation>Інструмент з таким іменем вже Існує.
+Оберіть інше ім’я, або натисніть <Apply>, якщо бажаєте змінити існуючий</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="613"/>
+        <source>Cannot delete preset tool</source>
+        <translation>Неможливо вилучити предналаштований інструмент</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="614"/>
+        <source>Cannot delete preset tool "%1"</source>
+        <translation>Неможливо вилучити предналаштований інструмент "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="632"/>
+        <source>Cannot modify preset tool name</source>
+        <translation>Неможливо змінити предналаштований інструмент</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="633"/>
+        <source>Cannot modify preset tool "%1"'s name</source>
+        <translation>Неможливо змінити предналаштований інструмент "%1"</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="658"/>
+        <source>Select tool executable</source>
+        <translation>Вкажіть виконавчий файл інструмента</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Select template document</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="666"/>
+        <source>Merkaartor document (*.mdc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/PreferencesDialog.cpp" line="674"/>
+        <source>Select Log directory</source>
+        <translation>Вкажіть теку для журналів</translation>
     </message>
 </context>
 <context>
@@ -5918,17 +5925,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="14"/>
         <source>Projections setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="20"/>
         <source>Projections</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="47"/>
         <source>Projection list:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="76"/>
@@ -5938,7 +5945,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="93"/>
         <source>PROJ4 string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.ui" line="105"/>
@@ -5963,7 +5970,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/ProjPreferencesDialog.cpp" line="48"/>
         <source>Please specify projection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5971,7 +5978,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/common/Projection.cpp" line="331"/>
         <source>Document</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5984,40 +5991,40 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="28"/>
         <source>Predefined</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="35"/>
         <source>Standard (EPSG:...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="61"/>
         <source>Custom PROJ4(+proj=...)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/ProjectionChooser.ui" line="71"/>
         <source>WKT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Error in WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="81"/>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="104"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="82"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="105"/>
         <source>Cannot export to PROJ4 format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Utils/ProjectionChooser.cpp" line="96"/>
+        <location filename="../src/Utils/ProjectionChooser.cpp" line="97"/>
         <source>Invalid WKT string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6051,6 +6058,11 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Властивості - Кілка елементів</translation>
     </message>
     <message>
+        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
+        <source>Properties - Node</source>
+        <translation>Властивості — Точка</translation>
+    </message>
+    <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="466"/>
         <source>Properties - Road</source>
         <translation>Властивості — Дорога</translation>
@@ -6069,7 +6081,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1048"/>
         <source>Error reading template file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/PropertiesDock.cpp" line="1158"/>
@@ -6086,38 +6098,10 @@ Please select another name or click the <Apply> button if you want to modi
         <source>Select member</source>
         <translation>Вкажіть членів</translation>
     </message>
-    <message>
-        <location filename="../src/Docks/PropertiesDock.cpp" line="451"/>
-        <source>Properties - Node</source>
-        <translation>Властивості — Точка</translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <source>Exporting GPX...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ExportGPX.cpp" line="45"/>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Cancel</source>
-        <translation>Відміна</translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="341"/>
-        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
-        <source>Importing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="391"/>
-        <source>Imported: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/Commands/DocumentCommands.cpp" line="132"/>
         <source>Cascaded cleanup</source>
         <translation>Каскадне очищення</translation>
@@ -6143,9 +6127,32 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Пересунути точку %1</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="59"/>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <source>Exporting GPX...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ExportGPX.cpp" line="46"/>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Cancel</source>
+        <translation>Відміна</translation>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="405"/>
+        <location filename="../src/ImportExport/ImportExportPBF.cpp" line="565"/>
+        <source>Importing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportGdal.cpp" line="455"/>
+        <source>Imported: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ImportExport/ImportExportOSC.cpp" line="60"/>
         <source>Import osmChange</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/ImportExport/ImportNGT.cpp" line="21"/>
@@ -6153,31 +6160,31 @@ Please select another name or click the <Apply> button if you want to modi
         <translation>Імпорт NGT</translation>
     </message>
     <message>
-        <location filename="../src/ImportExport/ImportNMEA.cpp" line="45"/>
+        <location filename="../src/ImportExport/ImportNMEA.cpp" line="46"/>
         <source>Import NMEA</source>
         <translation>Імпорт NMEA</translation>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Bing Road Detect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="767"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="794"/>
         <source>Cannot get output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="777"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="804"/>
         <source>No valid data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/common/FeatureManipulations.cpp" line="782"/>
+        <location filename="../src/common/FeatureManipulations.cpp" line="809"/>
         <source>Cannot parse output.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6193,14 +6200,14 @@ Please select another name or click the <Apply> button if you want to modi
         <location filename="../src/GPS/qgps.cpp" line="165"/>
         <location filename="../src/GPS/qgps.cpp" line="222"/>
         <source>No Fix</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="94"/>
         <location filename="../src/GPS/qgps.cpp" line="170"/>
         <location filename="../src/GPS/qgps.cpp" line="223"/>
         <source>No Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="135"/>
@@ -6230,7 +6237,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/GPS/qgps.cpp" line="162"/>
         <source>Fix OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/GPS/qgps.cpp" line="221"/>
@@ -6241,12 +6248,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSComDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="689"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="692"/>
         <source>GPS log error</source>
         <translation>Помилка запису GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="690"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="693"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Неможливо створити файл журналу GPS:%1.</translation>
     </message>
@@ -6254,17 +6261,17 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QGPSDDevice</name>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="971"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="974"/>
         <source>Unable to connect to %1:%2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1090"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1095"/>
         <source>GPS log error</source>
         <translation>Помилка запису GPS</translation>
     </message>
     <message>
-        <location filename="../src/GPS/qgpsdevice.cpp" line="1091"/>
+        <location filename="../src/GPS/qgpsdevice.cpp" line="1096"/>
         <source>Unable to create GPS log file: %1.</source>
         <translation>Неможливо створити файл журналу GPS:%1.</translation>
     </message>
@@ -6350,92 +6357,136 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>QtToolBarDialog</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1798"/>
-        <source>< S E P A R A T O R ></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="16"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="16"/>
         <source>Customize Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="31"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="31"/>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="46"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="46"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="53"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="53"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="60"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="60"/>
         <source>Remove</source>
         <translation>Вилучити</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="67"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="67"/>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="84"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="84"/>
         <source>Restore All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="104"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="104"/>
         <source>OK</source>
         <translation>Так</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="111"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="111"/>
         <source>Apply</source>
         <translation>Застосувати</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="118"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="118"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="143"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="143"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="158"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="158"/>
         <source><-</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="173"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="173"/>
         <source>-></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="188"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="188"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.ui" line="213"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.ui" line="213"/>
         <source>Current Toolbar Actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1798"/>
+        <source>< S E P A R A T O R ></source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QtToolBarDialogPrivate</name>
     <message>
-        <location filename="../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp" line="1247"/>
+        <location filename="../src/QToolBarDialog/qttoolbardialog.cpp" line="1247"/>
         <source>Custom Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaGzipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="60"/>
+        <source>QIODevice::Append is not supported for GZIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="66"/>
+        <source>Opening gzip for both reading and writing is not supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="74"/>
+        <source>You can open a gzip either for reading or for writing. Which is it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quagzipfile.cpp" line="80"/>
+        <source>Could not gzopen() file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZIODevice</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="145"/>
+        <source>QIODevice::Append is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quaziodevice.cpp" line="150"/>
+        <source>QIODevice::ReadWrite is not supported for QuaZIODevice</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFile</name>
+    <message>
+        <location filename="../3rdparty/quazip-0.7/quazip/quazipfile.cpp" line="218"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6453,7 +6504,7 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="51"/>
         <source>Remove selected member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="54"/>
@@ -6471,17 +6522,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="148"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="151"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRelationProperties.ui" line="164"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6509,17 +6560,17 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="87"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="90"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="103"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumRoadProperties.ui" line="106"/>
@@ -6570,12 +6621,12 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="88"/>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/SelectionDialog.ui" line="106"/>
         <source>Maximum returned results (0 for all)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6589,12 +6640,12 @@ Please select another name or click the <Apply> button if you want to modi
 <context>
     <name>SpecialLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="606"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="607"/>
         <source>Refresh layer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="611"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="612"/>
         <source>Close</source>
         <translation>Закрити</translation>
     </message>
@@ -6673,21 +6724,21 @@ Please select another name or click the <Apply> button if you want to modi
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="111"/>
         <source>Get Services</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="133"/>
         <source>Services :</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="143"/>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">This is a &quot;standard&quot; <a href="http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">TMS</a> server</span></p></body></html></source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="168"/>
@@ -6695,44 +6746,44 @@ p, li { white-space: pre-wrap; }
         <translation>Проекція:</translation>
     </message>
     <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
+        <source>Mercator (EPSG:900913)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
+        <source>Lat/Lon (EPSG:4326)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
+        <source>Origin is bottom-left</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="200"/>
         <source>Tile size:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="221"/>
         <source>Min zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="231"/>
         <source>Max zoom:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="248"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="262"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="176"/>
-        <source>Mercator (EPSG:900913)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="181"/>
-        <source>Lat/Lon (EPSG:4326)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="191"/>
-        <source>Origin is bottom-left</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/TMSPreferencesDialog.ui" line="289"/>
@@ -6750,27 +6801,21 @@ p, li { white-space: pre-wrap; }
         <translation>Вилучити</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="270"/>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Merkaartor: GetServices</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="217"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="219"/>
         <source>Address and Path cannot be blank.</source>
         <translation>Адреса та путь не можуть бути порожніми.</translation>
     </message>
     <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="271"/>
-        <source>Download failed: %1.</source>
-        <translation>Збій під час завантаження: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="280"/>
+        <location filename="../src/Preferences/TMSPreferencesDialog.cpp" line="272"/>
         <source>Error reading services.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6801,17 +6846,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="34"/>
         <source>OR</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="44"/>
         <source>AND</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="54"/>
         <source>NOT</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="64"/>
@@ -6821,12 +6866,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="76"/>
         <source>is</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Utils/TagSelectorWidget.ui" line="81"/>
         <source>isoneof</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6850,111 +6895,111 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="6"/>
         <source>Terrace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="15"/>
         <source>No House Numbering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="27"/>
         <source>Number of houses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="46"/>
         <source>Add House Numbering (Karlsruhe scheme)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="68"/>
         <source>Ranges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="81"/>
         <source>For example "1-9;15-17;19,19A"</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="88"/>
         <source>Pattern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="99"/>
         <source>All numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="104"/>
         <source>Odd numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="109"/>
         <source>Even numbers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/common/TerraceDialog.ui" line="123"/>
         <source>Optionally you can also select a node in the area and house numbering will start at that end.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackLayer</name>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="633"/>
+        <source>Extract - %1</source>
+        <translation>Видобування - %1</translation>
+    </message>
+    <message>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source># of track segments</source>
         <translation>сегментів треку — #</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="716"/>
+        <location filename="../src/Layers/Layer.cpp" line="724"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>Total distance</source>
         <translation>Загальна відстань</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="717"/>
+        <location filename="../src/Layers/Layer.cpp" line="725"/>
         <source>%1 km</source>
         <translation>%1 км</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>Total duration</source>
         <translation>Загальна тривалість</translation>
     </message>
     <message>
-        <location filename="../src/Layers/Layer.cpp" line="718"/>
+        <location filename="../src/Layers/Layer.cpp" line="726"/>
         <source>%1h %2m</source>
         <translation>%1г %2хв</translation>
     </message>
-    <message>
-        <location filename="../src/Layers/Layer.cpp" line="625"/>
-        <source>Extract - %1</source>
-        <translation>Видобування - %1</translation>
-    </message>
 </context>
 <context>
     <name>TrackLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="562"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="563"/>
         <source>Extract Drawing layer</source>
         <translation>Видобути шар,що редагується</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="567"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="568"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="575"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="576"/>
         <source>Close</source>
         <translation>Закрити</translation>
     </message>
@@ -6994,17 +7039,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="107"/>
         <source>Add "source" tag</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="110"/>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="123"/>
         <source>Remove selected tag(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Docks/MinimumTrackPointProperties.ui" line="126"/>
@@ -7053,12 +7098,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UploadedLayerWidget</name>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="661"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="662"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/Layers/LayerWidget.cpp" line="666"/>
+        <location filename="../src/Layers/LayerWidget.cpp" line="667"/>
         <source>Clear</source>
         <translation>Очистити</translation>
     </message>
@@ -7066,35 +7111,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WMSPreferencesDialog</name>
     <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="408"/>
-        <source>Merkaartor: GetCapabilities</source>
-        <translation>Merkaartor: Отримання властивостей</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="346"/>
-        <source>Address and Path cannot be blank.</source>
-        <translation>Адреса та путь не можуть бути порожніми.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="409"/>
-        <source>Download failed: %1.</source>
-        <translation>Збій під час завантаження: %1.</translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="557"/>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="394"/>
-        <source>Error reading capabilities.
-</source>
-        <translation>Помилка читання властивостей.
-</translation>
-    </message>
-    <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="14"/>
         <source>WMS servers setup</source>
         <translation>Налаштування серверів WMS</translation>
@@ -7134,9 +7150,9 @@ p, li { white-space: pre-wrap; }
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">This is a caching WMS (</span><a href="http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">WMS-C)</span></a><span style=" font-weight:600;"> serv [...]
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="163"/>
@@ -7146,17 +7162,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="194"/>
         <source>Tile it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="214"/>
         <source>Zoom levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="239"/>
         <source>Image format:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="263"/>
@@ -7166,12 +7182,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="293"/>
         <source>"source" tag value:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="307"/>
         <source>License URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/Preferences/WMSPreferencesDialog.ui" line="334"/>
@@ -7188,5 +7204,34 @@ p, li { white-space: pre-wrap; }
         <source>Remove</source>
         <translation>Вилучити</translation>
     </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="436"/>
+        <source>Merkaartor: GetCapabilities</source>
+        <translation>Merkaartor: Отримання властивостей</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="369"/>
+        <source>Address and Path cannot be blank.</source>
+        <translation>Адреса та путь не можуть бути порожніми.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="422"/>
+        <source>Error reading capabilities.
+</source>
+        <translation>Помилка читання властивостей.
+</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="437"/>
+        <source>Download failed: %1.</source>
+        <translation>Збій під час завантаження: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/Preferences/WMSPreferencesDialog.cpp" line="585"/>
+        <source>Unnamed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/windows/copydeps.sh b/windows/copydeps.sh
index 8c489da..04d6fe8 100644
--- a/windows/copydeps.sh
+++ b/windows/copydeps.sh
@@ -1,3 +1,17 @@
 #!/bin/sh
 
+# Copy Merkaartor and it's binary dependencies
 cp `cygcheck.exe binaries/bin/merkaartor.exe  | grep mingw.*dll$ | sed -e 's/^ *//' | sort -u` ./binaries/bin/
+
+
+# Run Windeployqt, mostly to copy all the plugins required by qt, and some more libs
+# The ICU hack is there due to a bug in windeployqt, that won't find the lib
+# with "lib" prefix. We later delete it not to have it twice.
+ICU=`echo /mingw64/bin/libicudt[0-9][0-9].dll`
+cp "$ICU" "${ICU/libicudt/icudt}"
+windeployqt binaries/bin/merkaartor.exe
+rm binaries/bin/icudt[0-9][0-9].dll
+
+# Copy translations, qt ones are already copied by windeployqt
+mkdir binaries/bin/translations
+cp translations/*.qm binaries/bin/translations/
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 363450e..6287cfc 100644
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -68,7 +68,7 @@ Section "Merkaartor" SecMerkaartor
 
   
   ;ADD YOUR OWN FILES HERE...
-  File ..\binaries\bin\*
+  File /r /x plugins /x translations ..\binaries\bin\*
 
   ; Menu shortcut
   CreateDirectory "$SMPROGRAMS\Merkaartor"
@@ -101,6 +101,13 @@ Section "Background plugins" SecBackgroundPlugins
 
 SectionEnd
 
+Section "Translations" SecTranslations
+
+  SetOutPath "$INSTDIR"
+  File /r ..\binaries\bin\translations
+
+SectionEnd
+
 ;--------------------------------
 ;Languages
  
@@ -112,11 +119,13 @@ SectionEnd
   ;Language strings
   LangString DESC_SecMerkaartor ${LANG_ENGLISH} "The program and necessary libraries."
   LangString DESC_SecBackgroundPlugins ${LANG_ENGLISH} "Access to some background layers, including Bing."
+  LangString DESC_SecTranslations ${LANG_ENGLISH} "Install translations for various languages."
 
   ;Assign language strings to sections
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${SecMerkaartor} $(DESC_SecMerkaartor)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecBackgroundPlugins} $(DESC_SecBackgroundPlugins)
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecTranslations} $(DESC_SecTranslations)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
diff --git a/windows/upload-to-bintray.pl b/windows/upload-to-bintray.pl
new file mode 100755
index 0000000..00d4d38
--- /dev/null
+++ b/windows/upload-to-bintray.pl
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+
+use common::sense;
+
+for my $file (@ARGV) {
+    print "Processing $file...\n";
+    # File looks like this:
+    # merkaartor-0.18.2-105-g9071144-64bit.exe
+    if ($file =~ m!merkaartor-([0-9.]*)-([0-9]+-[a-z0-9]{8})?-?([0-9]+bit).exe!) {
+        my ($short, $version, $tag, $arch) = ($&, $1, $2, $3);
+        print "Short name = '$short'\n";
+        print "Version = '$version'\n";
+        print "Tag = '$tag'\n";
+        print "Arch = '$arch'\n";
+        my $repo = "";
+        my $vstring = "";
+        my $q = "";
+        if (length $tag) {
+            $repo = "nightly";
+            $vstring = "$version-$tag";
+            $q = "?publish=1";
+        } else {
+            $repo = "release";
+            $vstring = "$version";
+        }
+        my $cmd = "curl -T '$file' -ukrakonos:$ENV{BINTRAY_TOKEN} 'https://api.bintray.com/content/krakonos/$repo/Merkaartor/$vstring/$short$q'";
+        system($cmd) and die "Failed to upload file $file."; # And means or... if exit code wasn't 0
+        print "\n";
+    } else {
+        print "Filename '$file' does not match!\n";
+    }
+}
+

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



More information about the Pkg-grass-devel mailing list